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

ci/allowed_signers

@@ -1 +1,2 @@
 torsten.wierschin@life-maps.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMV8yH39fMOQE5BeCsxI8RMUXbDBJvRuS5phTTfrXF0H
+berrux.kana@axilinx.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6kKREEjPzWMq8zjhIUCeiPI1MtwVHiZHaKxkePmW4t berrux.kana@axilinx.com

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

@@ -1,4 +1,4 @@
 # export MIGRATE_PIPELINE_ROOT="/home/torsten/sandbox/qt6-migration-pipeline"
-export MIGRATE_PIPELINE_ROOT="Passe Deinen Pfad an."
+export MIGRATE_PIPELINE_ROOT="/home/torsten/sandbox/qt6-migration-pipeline"
 export LANG=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/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})
@@ -75,7 +84,16 @@ ENDIF()
 
 ADD_DEFINITIONS(-DAPP6C)
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+# Resolve <DDS/...> and other framework includes to the real headers under
+# Lts/ BEFORE the migration stub tree in include/. The stub tree shadows them
+# otherwise and opens namespace DDSGeneric around framework includes, which
+# pulls Qt/std definitions into that namespace and breaks every consumer.
+# (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)
@@ -83,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)
@@ -100,7 +136,6 @@ include_directories(${CMAKE_SOURCE_DIR}/include/ExerciseEventManagement)
 include_directories(${CMAKE_BINARY_DIR}/Lts/Services/ExerciseManagement)
 include_directories(${CMAKE_SOURCE_DIR}/include/ExerciseManagement)
 include_directories(${CMAKE_BINARY_DIR}/Lts/Services/FileManagement)
-include_directories(${CMAKE_SOURCE_DIR}/include/FileManagement)
 include_directories(${CMAKE_BINARY_DIR}/Lts/Services/NotificationManagement)
 include_directories(${CMAKE_SOURCE_DIR}/include/NotificationManagement)
 include_directories(${CMAKE_BINARY_DIR}/Lts/Services/ParticipantManagement)
@@ -109,23 +144,59 @@ include_directories(${CMAKE_BINARY_DIR}/Lts/Services/ReportManagement)
 include_directories(${CMAKE_SOURCE_DIR}/include/ReportManagement)
 include_directories(${CMAKE_BINARY_DIR}/Lts/Services/SituationReplay)
 include_directories(${CMAKE_SOURCE_DIR}/include/SituationReplay)
-include_directories(${CMAKE_SOURCE_DIR}/include/Buildings)
+# Evaluations' generated evl_db_structs.h includes <evl_enums.hpp> by bare name, and that
+# header is consumed from OcBaseDownload as well, so its build dir must be visible tree-wide
+# like the services above. There is no include/Evaluations stub tree, so only the build dir
+# 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)
-include_directories(${CMAKE_SOURCE_DIR}/include/DDS)
-include_directories(${CMAKE_SOURCE_DIR}/include/DDS/Generic)
-include_directories(${CMAKE_SOURCE_DIR}/include/TrainingAreaBaseOC)
 # Generated DDS headers (BUILD_RTI=ON)
 include_directories(${CMAKE_BINARY_DIR}/Lts)
+# <Core/core.hpp> consumers (LtsCoordinate, AES/CES, HLA proxies) resolve the
+# rtiddsgen-generated core.hpp from the DDS build dir (the qt5 include order);
+# the OFF-era stub copies in include/Core/ have been removed.
+include_directories(${CMAKE_BINARY_DIR}/Lts/DDS)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Common)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Common/LtsUtils)
 include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore)
+# LtsUtilsSettings's generated ltsutilssettings_export.h is included by bare name from
+# settings.h. Consumer targets that reach settings.h transitively (without linking
+# LtsUtilsSettings themselves) cannot see it through the target's PUBLIC interface, so the
+# 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
+# directory holds only the generated header.
+include_directories(${CMAKE_BINARY_DIR}/Lts/DDS/DDSConnector)
+# The generated msg_db_structs.h includes <msg_enums.hpp> by bare name, and Messaging is
+# reached transitively from OcBaseDownload and the proxy handlers, so its build dir must be
+# visible tree-wide like the services above. Unlike them there is no include/Messaging stub
+# tree, so only the build dir is added.
+include_directories(${CMAKE_BINARY_DIR}/Lts/Services/Messaging)
 include_directories(${CMAKE_SOURCE_DIR}/Z/src/NGLLogger)
 include_directories(${CMAKE_SOURCE_DIR}/include/Viewer/SituationMap)
 include_directories(${CMAKE_SOURCE_DIR}/include/OperatorManagement)
-include_directories(${CMAKE_SOURCE_DIR}/include/FileManagement)
-include_directories(${CMAKE_SOURCE_DIR}/forward-declarations)
+# The generated opm_db_structs.h includes <opm_enums.hpp> by bare name and is reached
+# transitively from OcBaseDownload, so the OperatorManagement build dir has to be visible
+# tree-wide next to its include/ stub tree above.
+include_directories(${CMAKE_BINARY_DIR}/Lts/Services/OperatorManagement)
+# The plugin interface headers live under Lts/Plugins/<Svc>/ and are included both as
+# <Plugins/<Svc>/x.h> (the qt5 spelling, resolved through the Lts/ root) and, since the
+# migration dropped the leading segment, as <Svc>/x.h>. Lts/Plugins is therefore needed on
+# the path. It is appended last so it can only ever resolve includes that were unresolvable
+# before: every include that resolves today is found in an earlier directory, so no existing
+# resolution can change.
+include_directories(${CMAKE_SOURCE_DIR}/Lts/Plugins)
 SET(CMAKE_CXX_STANDARD 17)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
@@ -151,11 +222,18 @@ OPTION(BUILD_PLUGINS_PARTICIPANT_ORG_CHART "Build ParticipantOrgChart (requires
 OPTION(BUILD_PLUGINS_MSDL "Build MSDL module (requires Qt6 XmlPatterns)" OFF)
 OPTION(BUILD_PLUGINS_SAAB "Build Saab module (requires Qt6 XmlPatterns)" OFF)
 OPTION(BUILD_RTI "Build RTI Connext DDS dependent modules" OFF)
+OPTION(BUILD_VIEWER_ONLY "Build only Viewer module (no RTI required)" OFF)
 # Add Lts/ include path globally for QosProfile and other Lts headers
 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)
@@ -185,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()
@@ -206,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)
@@ -257,8 +340,11 @@ if(Qt6Core5Compat_FOUND)
 endif()
 
 # Find Qt6 core components first (without OpenGL which may not be available)
+# WebSockets is required by the migrated services (FileManagement's THP script
+# 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.
@@ -268,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)
@@ -288,12 +374,33 @@ 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)
-  get_filename_component(QT6_ROOT_DIR "${Qt6Core_DIR}/../../.." ABSOLUTE)
-  set(QT6_LIB_DIR "${QT6_ROOT_DIR}/lib")
-  set(QT6_INC_DIR "${QT6_ROOT_DIR}/include")
+  # <Qt6Core_DIR> is the cmake package dir: <prefix>/lib/cmake/Qt6Core in the
+  # standard Qt layout and <prefix>/<multiarch>/cmake/Qt6Core in the Debian/
+  # Ubuntu layout — so the library dir is two levels up in both. (Going three
+  # levels up and appending /lib only matches the standard layout; in the
+  # Debian validation container it resolved to /usr/lib/lib and every manual
+  # target below was silently skipped, breaking all targets linking
+  # Qt6::Sql / Qt6::Xml / Qt6::Test.)
+  get_filename_component(QT6_LIB_DIR "${Qt6Core_DIR}/../.." ABSOLUTE)
+  get_filename_component(QT6_ARCH_DIR "${QT6_LIB_DIR}" NAME)
+  # The standard layout keeps headers in <prefix>/include; Debian/Ubuntu keeps
+  # them in <prefix>/include/<multiarch>/qt6 — probe the multiarch form first.
+  if(EXISTS "${QT6_LIB_DIR}/../../include/${QT6_ARCH_DIR}/qt6")
+    get_filename_component(QT6_INC_DIR "${QT6_LIB_DIR}/../../include/${QT6_ARCH_DIR}/qt6" ABSOLUTE)
+  else()
+    get_filename_component(QT6_INC_DIR "${QT6_LIB_DIR}/../include" ABSOLUTE)
+  endif()
 elseif(DEFINED ENV{QT_BASE_DIR} AND DEFINED ENV{QT_VERSION} AND DEFINED ENV{QT_ARCH_DIR})
   set(QT6_LIB_DIR "$ENV{QT_BASE_DIR}/$ENV{QT_VERSION}/$ENV{QT_ARCH_DIR}/lib")
   set(QT6_INC_DIR "$ENV{QT_BASE_DIR}/$ENV{QT_VERSION}/$ENV{QT_ARCH_DIR}/include")
@@ -322,6 +429,13 @@ if(NOT TARGET Qt6::Gui AND EXISTS "${QT6_LIB_DIR}/libQt6Gui.so.6")
   )
 endif()
 
+# Set variable for legacy code that uses ${Qt6_Gui} — like Qt6_Widgets below,
+# subdirectory CMakeLists contain `set(Qt6_Gui ${Qt6_Gui})` optional-guard
+# no-ops that keep this root-scope value.
+if(TARGET Qt6::Gui)
+  set(Qt6_Gui Qt6::Gui)
+endif()
+
 # Qt6::Widgets - create manual target (find_package fails without OpenGL)
 if(EXISTS "${QT6_LIB_DIR}/libQt6Widgets.so.6")
   if(NOT TARGET Qt6::Widgets)
@@ -338,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)
@@ -393,8 +531,21 @@ if(NOT TARGET Qt6::Multimedia AND EXISTS "${QT6_LIB_DIR}/libQt6Multimedia.so.6")
   message(STATUS "Manually configured Qt6 Multimedia target")
 endif()
 
-# Qt6::Svg - create manual target if not found
-if(NOT TARGET Qt6::Svg AND EXISTS "${QT6_LIB_DIR}/libQt6Svg.so.6")
+# Stub Qt6::Multimedia target if not available (needed by OscSystemGuiPlugin, etc.)
+if(NOT TARGET Qt6::Multimedia)
+  add_library(Qt6::Multimedia INTERFACE IMPORTED)
+  set_target_properties(Qt6::Multimedia PROPERTIES
+    INTERFACE_COMPILE_DEFINITIONS "QT_NO_MULTIMEDIA"
+  )
+  message(STATUS "Created stub target for Qt6::Multimedia (library not available)")
+endif()
+
+# Qt6::Svg - create manual target if not found. Also require the headers:
+# the container can ship the runtime library (libqt6svg6 via Recommends)
+# without qt6-svg-dev, and an imported target with a non-existent
+# INTERFACE_INCLUDE_DIRECTORIES entry fails the CMake generate step for
+# every Svg consumer. Without headers the stub below is used instead.
+if(NOT TARGET Qt6::Svg AND EXISTS "${QT6_LIB_DIR}/libQt6Svg.so.6" AND EXISTS "${QT6_INC_DIR}/QtSvg")
   add_library(Qt6::Svg SHARED IMPORTED)
   set_target_properties(Qt6::Svg PROPERTIES
     IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6Svg.so.6"
@@ -404,6 +555,12 @@ if(NOT TARGET Qt6::Svg AND EXISTS "${QT6_LIB_DIR}/libQt6Svg.so.6")
   message(STATUS "Manually configured Qt6 Svg target")
 endif()
 
+# Stub Qt6::Svg target if not available (needed by various plugins)
+if(NOT TARGET Qt6::Svg)
+  add_library(Qt6::Svg INTERFACE IMPORTED)
+  message(STATUS "Created stub target for Qt6::Svg (library not available)")
+endif()
+
 # Qt6::SerialPort - create manual target if not found
 if(NOT TARGET Qt6::SerialPort AND EXISTS "${QT6_LIB_DIR}/libQt6SerialPort.so.6")
   add_library(Qt6::SerialPort SHARED IMPORTED)
@@ -415,7 +572,81 @@ if(NOT TARGET Qt6::SerialPort AND EXISTS "${QT6_LIB_DIR}/libQt6SerialPort.so.6")
   message(STATUS "Manually configured Qt6 SerialPort target")
 endif()
 
-# Qt6::WebSockets - create manual target if not found
+# Stub Qt6::SerialPort target if not available (needed by TrainingAreaBaseOC)
+if(NOT TARGET Qt6::SerialPort)
+  add_library(Qt6::SerialPort INTERFACE IMPORTED)
+  set_target_properties(Qt6::SerialPort PROPERTIES
+    INTERFACE_COMPILE_DEFINITIONS "QT_NO_SERIALPORT"
+  )
+  message(STATUS "Created stub target for Qt6::SerialPort (library not available)")
+endif()
+
+# 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)
+  set_target_properties(Qt6::WebEngineCore PROPERTIES
+    INTERFACE_COMPILE_DEFINITIONS "QT_NO_WEBENGINE"
+  )
+  message(STATUS "Created stub target for Qt6::WebEngineCore (library not available)")
+endif()
+
+# Stub Qt6::WebEngineWidgets target if not available (needed by thp_viewer)
+if(NOT TARGET Qt6::WebEngineWidgets)
+  add_library(Qt6::WebEngineWidgets INTERFACE IMPORTED)
+  set_target_properties(Qt6::WebEngineWidgets PROPERTIES
+    INTERFACE_COMPILE_DEFINITIONS "QT_NO_WEBENGINE"
+  )
+  message(STATUS "Created stub target for Qt6::WebEngineWidgets (library not available)")
+endif()
+
+# Stub KDReports::KDReports target if not available (needed by LtsReportDisplay)
+# UNKNOWN (not INTERFACE) so FindKDReports.cmake can upgrade it with a real
+# IMPORTED_LOCATION; an INTERFACE imported target ignores IMPORTED_LOCATION.
+if(NOT TARGET KDReports::KDReports)
+  add_library(KDReports::KDReports UNKNOWN IMPORTED)
+  set_target_properties(KDReports::KDReports PROPERTIES
+    INTERFACE_COMPILE_DEFINITIONS "NO_KDREPORTS"
+  )
+  message(STATUS "Created stub target for KDReports::KDReports (library not available)")
+endif()
+
+# Stub Qt6::Core5Compat target if not available (needed by textEditorTest)
+if(NOT TARGET Qt6::Core5Compat)
+  add_library(Qt6::Core5Compat INTERFACE IMPORTED)
+  set_target_properties(Qt6::Core5Compat PROPERTIES
+    INTERFACE_COMPILE_DEFINITIONS "QT_NO_CORE5COMPAT"
+  )
+  message(STATUS "Created stub target for Qt6::Core5Compat (library not available)")
+endif()
+
+# Qt6::WebSockets - create manual target if not found (the container's Qt6
+# discovery takes the minimal path, so find_package never creates the
+# component targets). The migrated FileManagement service (THP script
+# server) needs the real module.
 if(NOT TARGET Qt6::WebSockets AND EXISTS "${QT6_LIB_DIR}/libQt6WebSockets.so.6")
   add_library(Qt6::WebSockets SHARED IMPORTED)
   set_target_properties(Qt6::WebSockets PROPERTIES
@@ -423,9 +654,19 @@ if(NOT TARGET Qt6::WebSockets AND EXISTS "${QT6_LIB_DIR}/libQt6WebSockets.so.6")
     INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtWebSockets;${QT6_INC_DIR}"
     INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Network"
   )
+  set(QT6_WEBSOCKETS_REAL_FOUND TRUE)
   message(STATUS "Manually configured Qt6 WebSockets target")
 endif()
 
+# Stub Qt6::WebSockets target if not available (needed by LtsWebSocket, httq, etc.)
+if(NOT TARGET Qt6::WebSockets)
+  add_library(Qt6::WebSockets INTERFACE IMPORTED)
+  set_target_properties(Qt6::WebSockets PROPERTIES
+    INTERFACE_COMPILE_DEFINITIONS "QT_NO_WEBSOCKETS"
+  )
+  message(STATUS "Created stub target for Qt6::WebSockets (library not available)")
+endif()
+
 # Qt6::PrintSupport - create manual target if not found
 if(NOT TARGET Qt6::PrintSupport AND EXISTS "${QT6_LIB_DIR}/libQt6PrintSupport.so.6")
   add_library(Qt6::PrintSupport SHARED IMPORTED)
@@ -437,6 +678,15 @@ if(NOT TARGET Qt6::PrintSupport AND EXISTS "${QT6_LIB_DIR}/libQt6PrintSupport.so
   message(STATUS "Manually configured Qt6 PrintSupport target")
 endif()
 
+# Stub Qt6::PrintSupport target if not available (needed by textEditorTest, thp_viewer)
+if(NOT TARGET Qt6::PrintSupport)
+  add_library(Qt6::PrintSupport INTERFACE IMPORTED)
+  set_target_properties(Qt6::PrintSupport PROPERTIES
+    INTERFACE_COMPILE_DEFINITIONS "QT_NO_PRINTSUPPORT"
+  )
+  message(STATUS "Created stub target for Qt6::PrintSupport (library not available)")
+endif()
+
 # Qt6::OpenGL - create manual target if not found
 if(NOT TARGET Qt6::OpenGL AND EXISTS "${QT6_LIB_DIR}/libQt6OpenGL.so.6")
   add_library(Qt6::OpenGL SHARED IMPORTED)
@@ -448,8 +698,38 @@ if(NOT TARGET Qt6::OpenGL AND EXISTS "${QT6_LIB_DIR}/libQt6OpenGL.so.6")
   message(STATUS "Manually configured Qt6 OpenGL target")
 endif()
 
+# Stub Qt6::OpenGL target if not available (needed by PwsGuiPlugin)
+if(NOT TARGET Qt6::OpenGL)
+  add_library(Qt6::OpenGL INTERFACE IMPORTED)
+  set_target_properties(Qt6::OpenGL PROPERTIES
+    INTERFACE_COMPILE_DEFINITIONS "QT_NO_OPENGL"
+  )
+  message(STATUS "Created stub target for Qt6::OpenGL (library not available)")
+endif()
+
+# Set variable for legacy code that uses ${Qt6_WebSockets} — subdirectory
+# CMakeLists contain `set(Qt6_WebSockets ${Qt6_WebSockets})` optional-guard
+# no-ops that keep this root-scope value.
+if(TARGET Qt6::WebSockets)
+  set(Qt6_WebSockets Qt6::WebSockets)
+endif()
+
+# The real Qt6 WebSockets module is available (either via find_package or the
+# manual import above): enable the real websocket code paths in httq,
+# LtsWebSocket and the migrated services (they check this macro; without it
+# they fall back to websocket-less operation).
+if(Qt6WebSockets_FOUND OR QT6_WEBSOCKETS_REAL_FOUND)
+  add_compile_definitions(QT6_WEBSOCKETS_AVAILABLE)
+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
 #
@@ -457,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")
@@ -492,6 +777,49 @@ IF(BUILD_RTI)
     # RTI Include-Pfade auch an MOC weitergeben (für Q_OBJECT Header mit RTI Types)
     SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${RTI_INCLUDE_DIRS})
 
+    # The generated <svc>_topic_type_plugin.h / <svc>_record_replay_plugin.h
+    # headers use Q_INTERFACES(DDSGeneric::TopicTypePlugin), so moc must see
+    # the Q_DECLARE_INTERFACE in Lts/DDS/... (resolved through the Lts include
+    # root). Without this path every <svc>TopicTypePlugin fails with
+    # "Undefined interface" even though the compiler sees the header.
+    SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/Lts)
+
+    # The ElevationMapManager stub header (include/Viewer/SituationMap/ElevationMap/)
+    # lives apart from its source (src/...), so moc needs its directory explicitly.
+    # NOTE: this must be set at root scope - subdir-scope appends do not reach
+    # the AutogenInfo MOC_INCLUDES.
+    SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/include/Viewer/SituationMap/ElevationMap)
+
+    # The migrated Projects declare Q_INTERFACES(ProjectPlugin::Plugin) and include
+    # <PluginInterfaces/project_plugin_interface.h>. That include dir
+    # (Lts/Common/PluginInterfaces/..) is only a target-level PUBLIC include of
+    # ProjectPluginInterface and is NOT part of the global include_directories that
+    # reach the AutogenInfo MOC_INCLUDES, so moc fails with "Undefined interface".
+    # Add the Lts/Common root explicitly (mirrors the Lts append above) 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/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/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/AarApp/aar_application.cpp

@@ -8,6 +8,7 @@
  */
 
 #include "aar_application.h"
+#include <utility>
 #include "ui_aarApp.h"
 #include "databases_model.h"
 
@@ -44,7 +45,7 @@ AarApplication::AarApplication(QWidget *parent)
 
   const QList<QScreen*> &screenList = QGuiApplication::screens();
   m_widgets.reserve(screenList.size());
-  for (QScreen *s : qAsConst(screenList))
+  for (QScreen *s : std::as_const(screenList))
   {
     QWidget *w = new QWidget(); // no parent
     w->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint);
@@ -86,7 +87,7 @@ AarApplication::~AarApplication()
   delete m_databasesModel;
   delete m_progressDialog;
 
-  for (QSqlDatabase db : qAsConst(m_dbMap))
+  for (QSqlDatabase db : std::as_const(m_dbMap))
     db.close();
 
   m_dbPostgres.close();

qt6-after/qt6-migrated-legatus/Lts/Application/AarApp/databases_model.cpp

@@ -56,13 +56,13 @@ bool DatabasesModel::initModel(const QSqlDatabase &db)
     }
 
     Exercise exercise;
-    exercise.m_id        = q.value(0).toInt();
+    exercise.id        = q.value(0).toInt();
     exercise.name      = q.value(1).toString();
     exercise.startTime = q.value(2).toLongLong();
     exercise.endTime   = q.value(3).toLongLong();
-    exercise.dbName    = QStringLiteral("lts_db_") + QString::number(exercise.m_id);
+    exercise.dbName    = QStringLiteral("lts_db_") + QString::number(exercise.id);
     exercise.stateId   = q.value(4).toInt();
-    TRACE_LOG(m_logger) << "Found exercise with id=" << exercise.m_id << ", name=" << exercise.name << ", startTime="
+    TRACE_LOG(m_logger) << "Found exercise with id=" << exercise.id << ", name=" << exercise.name << ", startTime="
                         << exercise.startTime << ", endTime=" << exercise.endTime << ", dbName=" << exercise.dbName
                         << ", stateId=" << exercise.stateId;
     if (exercise.stateId != 6)
@@ -86,7 +86,7 @@ QVariant DatabasesModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case Id:
-    return e.m_id;
+    return e.id;
   case Name:
     return QString(e.name);
   case StartTime:
@@ -176,7 +176,7 @@ void DatabasesModel::onDataChanged(const Exercise &data, DataModification modTyp
     row = m_vecData.indexOf(data);
     if (row != -1)
       if (removeRow(row))
-        emit dataChanged(index(std::min(row, m_vecData.size()-1), Columns::Id), index(m_vecData.size()-1, Columns::EndTime));
+        emit dataChanged(index(std::min<qsizetype>(row, m_vecData.size() - 1), Columns::Id), index(m_vecData.size()-1, Columns::EndTime));
     return;
   } // switch
 }

qt6-after/qt6-migrated-legatus/Lts/Application/AarApp/databases_model.h

@@ -32,8 +32,8 @@ struct Exercise
   qint64 endTime = 0;
   qint32 stateId = 0;
 
-  bool operator == (const Exercise &other) { return id == other.m_id; }
-  bool operator != (const Exercise &other) { return id != other.m_id; }
+  bool operator == (const Exercise &other) const { return id == other.id; }
+  bool operator != (const Exercise &other) const { return id != other.id; }
 };
 
 

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

@@ -46,8 +46,7 @@ int main(int argc, char *argv[])
   QCoreApplication::setApplicationName(QLatin1String("AarApplication"));
   QCoreApplication::setOrganizationName(QLatin1String("RME"));
 
-  if (!bHeadless)
-    app->setAttribute(Qt::AA_UseHighDpiPixmaps);
+  // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled)
 
 
   NGL::LoggerHandler *lh = dynamic_cast<NGL::LoggerHandler*>(app.data());

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

@@ -38,7 +38,7 @@ ENDIF()
 
 if(QT6_GUI_AVAILABLE)
   NGL_TARGET_LINK_LIBRARIES(OperatorApplication
-    ArcGISQt5Hack   # make sure it's loaded *before* libEsriCommonQt.so
+    $<IF:$<TARGET_EXISTS:ArcGISQt5Hack>,ArcGISQt5Hack,>   # make sure it's loaded *before* libEsriCommonQt.so (guard: only linked when the SituationMap viewer is built, matching CentralEffectSimulation)
     ${Qt6_Widgets}
     Qt6::Network
     nglapplication

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

@@ -36,6 +36,8 @@
 #include <QInputDialog>
 #include <QNetworkProxy>
 #include <QtCore/QTimer>
+#include <QInputDevice>
+#include <algorithm>
 
 
 class CmdLineParser : public LtsCommandLineParser::LtsCommandLineParser
@@ -157,7 +159,7 @@ public:
   bool isForcedTabletMode() const { return isSet(QStringLiteral("x")); }
   bool isForcedWSMode() const { return isSet(QStringLiteral("w")); }
   QString langIsoCode() const { return value(QStringLiteral("l")); }
-  QStringList ignoredPlugins() const { return value(QStringLiteral("ignore-plugins")).split(QLatin1Char(','), QString::SkipEmptyParts); }
+  QStringList ignoredPlugins() const { return value(QStringLiteral("ignore-plugins")).split(QLatin1Char(','), Qt::SkipEmptyParts); }
   bool checkRequirements() const { return isSet(QStringLiteral("check-requirements")); }
   QString skipScreen() const { return value(QStringLiteral("k")); }
   QString qosFile() const {  return value(QStringLiteral("q")).size() > 0 ?  value(QStringLiteral("q")) : QString(); }
@@ -172,7 +174,10 @@ public:
 // ------------------------------------------------------------------
 int main(int argc, char **argv) // TODO: json strings to lower
 {
-  qsrand(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);
 
@@ -187,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();
@@ -380,7 +385,7 @@ int main(int argc, char **argv) // TODO: json strings to lower
 
   if (!skipScreen.isEmpty())
   {
-    QStringList skipScreenList(skipScreen.split(QLatin1Char('.'), QString::SkipEmptyParts));
+    QStringList skipScreenList(skipScreen.split(QLatin1Char('.'), Qt::SkipEmptyParts));
 
     int skipScreenListCount = skipScreenList.count();
 
@@ -431,7 +436,8 @@ int main(int argc, char **argv) // TODO: json strings to lower
     sessionData->setAsTablet();
   else if (options.isForcedWSMode())
     sessionData->setAsTablet(false);
-  else if (!QTouchDevice::devices().isEmpty())
+  else if (std::any_of(QInputDevice::devices().cbegin(), QInputDevice::devices().cend(),
+                       [](const QInputDevice *dev) { return dev && dev->type() == QInputDevice::DeviceType::TouchScreen; }))
     sessionData->setAsTablet();
   LtsWidgets::LtsComboBox::setUseSelectionDialog(sessionData->isTablet());
 

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

@@ -72,7 +72,7 @@ NGL_TARGET_COMPILE_DEFINITIONS(thp_viewer
     ${VLC_DEFINES}
 )
 NGL_TARGET_LINK_LIBRARIES(thp_viewer
-  ArcGISQt5Hack   # make sure it's loaded *before* libEsriCommonQt.so
+  $<IF:$<TARGET_EXISTS:ArcGISQt5Hack>,ArcGISQt5Hack,>   # make sure it's loaded *before* libEsriCommonQt.so (guard: only linked when the SituationMap viewer is built, matching CentralEffectSimulation)
 
   ${VLC_LIBRARIES}
   Qt6::Core

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,8 +258,9 @@ void ThpViewer::onLinkClicked(const QUrl &url)
   const QString path = url.path();
   const QString lpath = path.toLower();
 
-  const QStringRef ext = lpath.splitRef(QLatin1Char('.')).last();
-  const QStringRef ext2Chars = ext.left(2);
+  // Use QStringView for efficient string operations
+  const QStringView ext = QStringView{lpath}.split(QLatin1Char('.')).last();
+  const QStringView ext2Chars = ext.left(2);
 
   ui->audioWidget->stop();
   ui->videoWidget->stop();
@@ -370,7 +371,7 @@ void ThpViewer::onLinkClicked(const QUrl &url)
     ui->backButton->setEnabled(true);
   }
   else if (ext == QLatin1String("html") &&
-           lpath.midRef(lpath.lastIndexOf(QLatin1Char('/')) + 1).startsWith(QLatin1String("combined_")))
+           QStringView{lpath}.mid(lpath.lastIndexOf(QLatin1Char('/')) + 1).startsWith(QLatin1String("combined_")))
   {
     // Kombiniert
     QHash<QString, QUrl> urls = getCombinedPlaybackDetails(url);
@@ -449,9 +450,8 @@ QHash<QString, QUrl> ThpViewer::getCombinedPlaybackDetails(const QUrl &url) cons
   QDomDocument doc(QStringLiteral("RSS"));
   if (!file.open(QIODevice::ReadOnly))
     return hash;
-  QString errorStr;
-  int errorLine, errorColumn;
-  if (!doc.setContent(&file, true, &errorStr, &errorLine, &errorColumn))
+  const auto parseResult = doc.setContent(&file, QDomDocument::ParseOption::UseNamespaceProcessing);
+  if (!parseResult)
   {
     file.close();
     return hash;

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,10 +32,10 @@ public:
   bool needsToBeOpenedExternally(const QUrl &url)
   {
     const QString lpath = url.toString();
-    const QStringRef ext = lpath.splitRef(QLatin1Char('.')).last();
-    const QStringRef ext2Chars = ext.left(2);
+    const QStringView ext = QStringView{lpath}.split(QLatin1Char('.')).last();
+    const QStringView ext2Chars = ext.left(2);
     if (ext == QLatin1String("html") &&
-        lpath.midRef(lpath.lastIndexOf(QLatin1Char('/')) + 1).startsWith(QLatin1String("combined_")))
+        QStringView{lpath}.mid(lpath.lastIndexOf(QLatin1Char('/')) + 1).startsWith(QLatin1String("combined_")))
       return true;
     // PDF
     if (ext == QLatin1String("pdf"))

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

@@ -7,6 +7,7 @@
   */
 
 #include "thp_situation_widget.h"
+#include <utility>
 #include "ui_thp_situation_building_base.h"
 
 #include "thp_situation_filter_aes.h"
@@ -384,7 +385,7 @@ bool SituationWidget::restoreOperatorMapSettingsOverlays(const SituationMap::Ope
   // So we have to do it here:
   const QList<int> &orderedOverlayIds = oms.orderedOverlays;
   DEBUG_LOG(m_logger) << LOGFUNCTION << " restore OverlayIds...";
-  for (auto overlayId : qAsConst(orderedOverlayIds))
+  for (auto overlayId : std::as_const(orderedOverlayIds))
   {
     DEBUG_LOG(m_logger) << LOGFUNCTION << " applyNewOverlay , overlayId=" << overlayId;
     applyNewOverlay(overlayId);

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

@@ -43,7 +43,8 @@ QString DataTopicWrapper::typeFq() const
 
 QString MemberInformationWrapper::ddsToQVariant() const
 {
-    return QStringLiteral("toQVariant(data.") + cppMemberName() + QStringLiteral("())");
+    // rtiddsgen 7.7 generates plain public members - access them directly.
+    return QStringLiteral("toQVariant(data.") + cppMemberName() + QStringLiteral(")");
 }
 
 QString MemberInformationWrapper::qVariantToDds() const
@@ -51,7 +52,7 @@ QString MemberInformationWrapper::qVariantToDds() const
     const QString ddsType =
         isOptional() ? (QStringLiteral("dds::core::optional<") + cppDdsType() + QLatin1Char('>')) : (cppDdsType());
 
-    return QStringLiteral("data.") + cppMemberName() + QStringLiteral("() = fromQVariant<") + ddsType +
+    return QStringLiteral("data.") + cppMemberName() + QStringLiteral(" = fromQVariant<") + ddsType +
            QStringLiteral(">(q.value(i++))");
 }
 
@@ -61,14 +62,15 @@ QString MemberInformationWrapper::ddsToJsonElement() const
     if (cppMemberName().isEmpty())
         return QStringLiteral("obj[QStringLiteral(\"") + cppType() + QStringLiteral("\")] = element;");
 
-    const QString memberAccess = isCppStruct() ? cppMemberName() : cppMemberName() + QStringLiteral("()");
+    // rtiddsgen 7.7 generates plain public members for every kind of
+    // member (struct or not), so no getter call is emitted.
+    const QString memberAccess = cppMemberName();
     if (!isOptional())
         return QStringLiteral("obj[QStringLiteral(\"") + cppMemberName() + QStringLiteral("\")] = ") + cppToJsonPre() +
                QStringLiteral("element.") + memberAccess + cppToJsonPost();
 
-    const QString optionalAccess =
-        isCppStruct() ? cppMemberName() + QStringLiteral(".is_set()") : cppMemberName() + QStringLiteral("().is_set()");
-    const QString getValue = isCppStruct() ? cppMemberName() : cppMemberName() + QStringLiteral("()");
+    const QString optionalAccess = cppMemberName() + QStringLiteral(".has_value()");
+    const QString getValue = cppMemberName();
     return QStringLiteral("if (element.") + optionalAccess + QStringLiteral(") ") +
            QStringLiteral("obj[QStringLiteral(\"") + cppMemberName() + QStringLiteral("\")] = ") + cppToJsonPre() +
            QStringLiteral("*element.") + getValue + cppToJsonPost();
@@ -86,12 +88,10 @@ QString MemberInformationWrapper::jsonElementToDds() const
     if (isOptional())
         ret += QStringLiteral("if (!val.isNull()) ");
 
-    if (isCppStruct())
-        ret += QStringLiteral("element.") + cppMemberName() + QStringLiteral(" = ") + cppFromJsonPre2() +
-               QStringLiteral("val") + cppFromJsonPost();
-    else
-        ret += QStringLiteral("element.") + cppMemberName() + QStringLiteral("(") + cppFromJsonPre2() +
-               QStringLiteral("val") + cppFromJsonPost() + QStringLiteral(")");
+    // rtiddsgen 7.7 generates plain public members - assign instead of
+    // calling a setter.
+    ret += QStringLiteral("element.") + cppMemberName() + QStringLiteral(" = ") + cppFromJsonPre2() +
+           QStringLiteral("val") + cppFromJsonPost();
 
     return ret;
 }

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

@@ -484,7 +484,9 @@ class IdlDataWrapper final : public NameWrapper
 
     QString nameGetter() const
     {
-        return m_data.name + (m_data.isOptional ? QStringLiteral("().get") : QString());
+        // rtiddsgen 7.7 generates public data members (no getters); optional
+        // members are omg::types::optional<T> and are unwrapped via .get().
+        return m_data.name + (m_data.isOptional ? QStringLiteral(".get()") : QString());
     }
 
   private:

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

@@ -874,6 +874,13 @@ bool StructBuilder::fixupQVariantConversions(MemberInformation& mi) const
         datatype == QLatin1String("long long"))
     {
         mi.cpp.type = QStringLiteral("qint64");
+        // IDL `long long` is int64_t (long) in the rtiddsgen 4.7 output, while the Qt side is
+        // qint64 (long long). Those are distinct types, so assignments such as
+        // `optional<int64_t> = optional<qint64>` do not compile. Carry the generated type
+        // separately, as the sequence<octet> branch below already does, so the DDS-facing code
+        // emitted from cppDdsType() names the type the struct member really has. The spelling
+        // is the one rtiddsgen itself writes, matching what the `long` branch does with int32_t.
+        mi.cpp.ddsType = QStringLiteral("int64_t");
         mi.cpp.fromVariantPost = QStringLiteral(".toLongLong()");
         mi.cpp.fromJsonPost = QStringLiteral(".toDouble()");
         mi.cpp.toJsonPre = QStringLiteral("static_cast<qint64>(");
@@ -1039,7 +1046,7 @@ QVector<MemberInformation> StructBuilder::buildDbTableInformationFromIdlData(con
                 pre += columnNamePrefix;
             pre += member.name + QLatin1Char('_');
             ret += buildDbTableInformationFromIdlData(cttiChild, tableName, StructBuilder::camelCaseToUnderline(pre),
-                                                      cppStructure + member.name + QStringLiteral("()."));
+                                                      cppStructure + member.name + QStringLiteral("."));
             continue;
         }
 

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

@@ -83,15 +83,12 @@ bool XmlReader::readServiceFile(const QString& svcFile, const QString& idlServic
     INFO_LOG(m_logger) << "SvcFile: " << svcFile;
 
     QDomDocument doc;
-    QString errorMsg;
-    int errorLine = 0;
-    int errorColumn = 0;
-    auto parseResult = doc.setContent(&f, &errorMsg, &errorLine, &errorColumn);
+    const auto parseResult = doc.setContent(&f);
     if (!parseResult)
     {
         m_errorString = QLatin1String("Error parsing service file '") + svcFile + QLatin1String("' at line ") +
-                        QString::number(errorLine) + QLatin1Char(':') +
-                        QString::number(errorColumn);
+                        QString::number(int(parseResult.errorLine)) + QLatin1Char(':') +
+                        QString::number(int(parseResult.errorColumn));
         ERROR_LOG(m_logger) << m_errorString;
         return false;
     }

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_dao.cpp.grantlee

@@ -30,7 +30,7 @@ Dao::Dao(int exerciseId)
   , m_bEmitMessageOnError(true)
   , m_bCanHandleSchemas(true)
   , m_ownDatabaseConnection(true)
-  , m_logger(&getLogger("Db"))
+  , m_logger(getLogger("Db"))
 {}
 
 Dao::~Dao()
@@ -55,7 +55,7 @@ bool Dao::init(const QString &dbUser,
 {
   m_ownDatabaseConnection = true;
 
-  m_dbConnection = DBConnection::open(*m_logger, dbUser, dbPasswd, dbDriver, dbHost, dbName, schemaName());
+  m_dbConnection = DBConnection::open(m_logger, dbUser, dbPasswd, dbDriver, dbHost, dbName, schemaName());
 
   return initInternal();
 }
@@ -65,15 +65,15 @@ bool Dao::initInternal()
   QSqlDriver *driver = m_dbConnection.driver();
   if (!driver)
   {
-    WARNING_LOG(*m_logger) << "No SQL driver loaded - no database available!";
+    WARNING_LOG(m_logger) << "No SQL driver loaded - no database available!";
     return false;
   }
   const QString driverName = m_dbConnection.driverName();
-  DEBUG_LOG(*m_logger) << "Connected to database " << m_dbConnection.databaseName() << "@" << m_dbConnection.hostName()
+  DEBUG_LOG(m_logger) << "Connected to database " << m_dbConnection.databaseName() << "@" << m_dbConnection.hostName()
                        << ", schema: " << schemaName() << ", used driver: " << driverName;
   if (!m_dbConnection.isOpen())
   {
-    WARNING_LOG(*m_logger) << "Database connection is no open - can not initialize database interface";
+    WARNING_LOG(m_logger) << "Database connection is no open - can not initialize database interface";
     return false;
   }
   if (driverName == QLatin1String("QSQLITE"))
@@ -82,7 +82,7 @@ bool Dao::initInternal()
 {% if has_db_notifications %}
   if (!driver->hasFeature(QSqlDriver::EventNotifications))
   {
-    WARNING_LOG(*m_logger) << "Can not subscribe to notifications - sqldriver does not support this feature!";
+    WARNING_LOG(m_logger) << "Can not subscribe to notifications - sqldriver does not support this feature!";
   }
   else
   {
@@ -91,7 +91,7 @@ bool Dao::initInternal()
 {% for cpp_struct in cpp_structs %}{% for db_notify in cpp_struct.dbNotifications %}driver->subscribeToNotification(QStringLiteral("{{ db_notify }}"));{% endfor %}{% endfor %}
   }
 {% endif %}
-  m_query = std::unique_ptr<NSqlQuery>(new NSqlQuery(m_dbConnection, *m_logger));
+  m_query = std::unique_ptr<NSqlQuery>(new NSqlQuery(m_dbConnection, m_logger));
   return true;
 }
 
@@ -134,7 +134,7 @@ QSqlError Dao::getLastError() const
 {% if has_db_notifications %}
 void Dao::onNotification(const QString &name, QSqlDriver::NotificationSource source, const QVariant &payload)
 {
-  DEBUG_LOG(*m_logger) << "Notification source = " << source;
+  DEBUG_LOG(m_logger) << "Notification source = " << source;
   if (source == QSqlDriver::SelfSource)
     return;
   // search coresponding signal

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_dao.h.grantlee

@@ -73,7 +73,7 @@ protected:
   bool m_bEmitMessageOnError;
   bool m_bCanHandleSchemas;
   bool m_ownDatabaseConnection;
-  NGL::INGLLogger* m_logger;
+  LOGGER_T m_logger;
 
 private:
   bool initInternal();

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_db_impl.cpp.grantlee

@@ -50,7 +50,7 @@ DatabaseInterfaceImpl::DatabaseInterfaceImpl(int exerciseId)
   , m_bEmitMessageOnError(true)
   , m_bCanHandleSchemas(true)
   , m_ownDatabaseConnection(true)
-  , m_logger(&getLogger("Db"))
+  , m_logger(getLogger("Db"))
 {}
 
 DatabaseInterfaceImpl::~DatabaseInterfaceImpl()
@@ -83,7 +83,7 @@ bool DatabaseInterfaceImpl::init(const QString &dbUser,
 {
   m_ownDatabaseConnection = true;
 
-  m_dbConnection = DBConnection::open(*m_logger, dbUser, dbPasswd, dbDriver, dbHost, dbName, schemaName());
+  m_dbConnection = DBConnection::open(m_logger, dbUser, dbPasswd, dbDriver, dbHost, dbName, schemaName());
 
   return initInternal();
 }
@@ -93,15 +93,15 @@ bool DatabaseInterfaceImpl::initInternal()
   QSqlDriver *driver = m_dbConnection.driver();
   if (!driver)
   {
-    WARNING_LOG(*m_logger) << "No SQL driver loaded - no database available!";
+    WARNING_LOG(m_logger) << "No SQL driver loaded - no database available!";
     return false;
   }
   const QString driverName = m_dbConnection.driverName();
-  DEBUG_LOG(*m_logger) << "Connected to database " << m_dbConnection.databaseName() << "@" << m_dbConnection.hostName()
+  DEBUG_LOG(m_logger) << "Connected to database " << m_dbConnection.databaseName() << "@" << m_dbConnection.hostName()
                        << ", schema: " << schemaName() << ", used driver: " << driverName;
   if (!m_dbConnection.isOpen())
   {
-    WARNING_LOG(*m_logger) << "Database connection is no open - can not initialize database interface";
+    WARNING_LOG(m_logger) << "Database connection is no open - can not initialize database interface";
     return false;
   }
   if (driverName == QLatin1String("QSQLITE"))
@@ -110,7 +110,7 @@ bool DatabaseInterfaceImpl::initInternal()
 {% if has_db_notifications %}
   if (!driver->hasFeature(QSqlDriver::EventNotifications))
   {
-    WARNING_LOG(*m_logger) << "Can not subscribe to notifications - sqldriver does not support this feature!";
+    WARNING_LOG(m_logger) << "Can not subscribe to notifications - sqldriver does not support this feature!";
   }
   else
   {
@@ -120,7 +120,7 @@ bool DatabaseInterfaceImpl::initInternal()
     driver->subscribeToNotification(QStringLiteral("{{ db_notify }}"));{% endfor %}{% endfor %}
   }
 {% endif %}
-  m_query = std::unique_ptr<NSqlQuery>(new NSqlQuery(m_dbConnection, *m_logger));
+  m_query = std::unique_ptr<NSqlQuery>(new NSqlQuery(m_dbConnection, m_logger));
   return true;
 }
 
@@ -163,7 +163,7 @@ QSqlError DatabaseInterfaceImpl::getLastError() const
 {% if has_db_notifications %}
 void DatabaseInterfaceImpl::onNotification(const QString &name, QSqlDriver::NotificationSource source, const QVariant &payload)
 {
-  DEBUG_LOG(*m_logger) << "Notification source = " << source;
+  DEBUG_LOG(m_logger) << "Notification source = " << source;
   // no need to emit notification signals
   if (source == QSqlDriver::SelfSource)
     return;
@@ -561,7 +561,7 @@ bool DatabaseInterfaceImpl::selectBy{{ fk.cppMemberNameCc }}(QVector<Database::{
   SqlQueryJanitor   janitor(m_query);
   if (!selectPrepareInternal{{ cpp_struct.name }}(QStringLiteral(" WHERE {{ fk.dbColumnName }} = :{{ fk.dbColumnName }}") + orderBy))
   {
-    ERROR_LOG(*m_logger) << "Error preparing query: " << m_query->lastError().text();
+    ERROR_LOG(m_logger) << "Error preparing query: " << m_query->lastError().text();
     m_lastError = m_query->lastError();
     return false;
   }
@@ -578,7 +578,7 @@ bool DatabaseInterfaceImpl::selectBy{{ fk.cppMemberNameCc }}(const std::function
   SqlQueryJanitor   janitor(m_query);
   if (!selectPrepareInternal{{ cpp_struct.name }}(QStringLiteral(" WHERE {{ fk.dbColumnName }} = :{{ fk.dbColumnName }}") + orderBy))
   {
-    ERROR_LOG(*m_logger) << "Error preparing query: " << m_query->lastError().text();
+    ERROR_LOG(m_logger) << "Error preparing query: " << m_query->lastError().text();
     m_lastError = m_query->lastError();
     return false;
   }
@@ -658,7 +658,7 @@ bool DatabaseInterfaceImpl::remove{{ cpp_struct.nameCc }}By{{ fk.cppMemberNameCc
 
   if (!m_query->prepare(stmt))
   {
-    ERROR_LOG(*m_logger) << "Error preparing query: " << m_query->lastError().text();
+    ERROR_LOG(m_logger) << "Error preparing query: " << m_query->lastError().text();
     m_lastError = m_query->lastError();
     return false;
   }

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_db_impl.h.grantlee

@@ -94,7 +94,7 @@ protected:
   bool m_bEmitMessageOnError;
   bool m_bCanHandleSchemas;
   bool m_ownDatabaseConnection;
-  NGL::INGLLogger* m_logger;
+  LOGGER_T m_logger;
 private:
   bool initInternal();
 };// class DatabaseInterfaceImpl

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_db_structs.h.grantlee

@@ -26,7 +26,7 @@
 {% endif %}
 
 #include <{{ include_prefix }}/{{ namespace_abbr }}_export.h>
-#include <{{ namespace_abbr }}_enums.hpp>
+#include <{{ include_prefix }}/{{ namespace_abbr }}_enums.hpp>
 
 {% for ext_service in ext_services.member %}
 #include <{{ ext_service.baseFilePath }}.hpp>

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_dtc_impl.cpp.grantlee

@@ -56,14 +56,14 @@ std::shared_ptr<Dtc> Dtc::create(const std::shared_ptr<DDSConnector::DdsConnecto
   auto ret = std::make_shared<DtcImpl>(ddsConnector);
   {% endif %}
   s_availableConnectors.insert(std::make_pair(ddsConnector.get(), ret));
-  return std::move(ret);  // c++11 defect
+  return ret;  // moved implicitly (C++17; explicit std::move on a local triggers -Wredundant-move)
 }
 
 // DtcImpl
 DtcImpl::DtcImpl(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : Dtc()
   , m_ddsConnector(ddsConnector)
-  , m_logger(&getLogger("Dtc"))
+  , m_logger(getLogger("Dtc"))
 {}
 
 DtcImpl::~DtcImpl()
@@ -75,7 +75,7 @@ bool DtcImpl::enableAll(bool enable)
 { {% for dt in dataTopics.member %} {% if dt.dtcImpl %} {% if dt.autosubscribe %}
   if (!enable{{ dt.name }}(enable))
   {
-    ERROR_LOG(*m_logger) << "Error initializing data topic {{ dt.name }}";
+    ERROR_LOG(m_logger) << "Error initializing data topic {{ dt.name }}";
     return false;
   }
   {% endif %} {% endif %} {% endfor %}
@@ -97,7 +97,7 @@ bool DtcImpl::checkEnabled(const DTC &dtc) const
   if (!dtc)
   {
     using TOPIC = typename DtcConstraints<DTC>::TOPIC ;
-    WARNING_LOG(*m_logger) << "Error retrieving data topic "
+    WARNING_LOG(m_logger) << "Error retrieving data topic "
                           << DDS::topic_type_name<TOPIC>::value() << " - not enabled";
     Q_ASSERT(false);
     return false;
@@ -176,7 +176,7 @@ bool DtcImpl::enable{{ dt.name }}(bool enable)
   {
     if (m_dtc{{ dt.name }})
     {
-      INFO_LOG(*m_logger) << "{{ dt.name }} already enabled!";
+      INFO_LOG(m_logger) << "{{ dt.name }} already enabled!";
       return true;
     }
     m_dtc{{ dt.name }}.reset(m_ddsConnector->createDTC<DTC::{{ dt.name }}Impl>());
@@ -200,7 +200,7 @@ bool DtcImpl::waitForHistoricalData{{ dt.name }}(int timeoutMSec)
   if (!is{{ dt.name }}Enabled())
   {
     enable{{ dt.name }}();
-    DEBUG_LOG(*m_logger) << "NEED TO ENABLE ! {{ dt.name }}" ;
+    DEBUG_LOG(m_logger) << "NEED TO ENABLE ! {{ dt.name }}" ;
   }
 
   if (!waitForHistoricalData(m_dtc{{ dt.name }}, timeoutMSec))
@@ -228,7 +228,7 @@ QMap<{{ dt.key.cppType }},::{{ namespace }}::{{ dt.type }}> DtcImpl::{{ dt.nameF
   if (!is{{ dt.name }}Enabled())
   {
      enable{{ dt.name }}();
-     DEBUG_LOG(*m_logger) << "NEED TO ENABLE ! {{ dt.name }}" ;
+     DEBUG_LOG(m_logger) << "NEED TO ENABLE ! {{ dt.name }}" ;
      waitForHistoricalData{{ dt.name }}(10);
   }
   return m_{{ dt.nameFlc }}Cont;
@@ -239,7 +239,7 @@ bool DtcImpl::{{ dt.nameFlc }}s(const std::function<void(const ::{{ namespace }}
   if (!is{{ dt.name }}Enabled())
   {
     enable{{ dt.name }}();
-    DEBUG_LOG(*m_logger) << "NEED TO ENABLE ! {{ dt.name }}" ;
+    DEBUG_LOG(m_logger) << "NEED TO ENABLE ! {{ dt.name }}" ;
     waitForHistoricalData{{ dt.name }}(10);
   }
   return iterateAll(m_dtc{{ dt.name }}, m_{{ dt.nameFlc }}Cont, cb);
@@ -250,7 +250,7 @@ bool DtcImpl::{{ dt.nameFlc }}s(const std::function<bool(const ::{{ namespace }}
   if (!is{{ dt.name }}Enabled())
   {
     enable{{ dt.name }}();
-    DEBUG_LOG(*m_logger) << "NEED TO ENABLE ! {{ dt.name }}" ;
+    DEBUG_LOG(m_logger) << "NEED TO ENABLE ! {{ dt.name }}" ;
     waitForHistoricalData{{ dt.name }}(10);
   }
   return iterateUntil(m_dtc{{ dt.name }}, m_{{ dt.nameFlc }}Cont, cb);
@@ -261,7 +261,7 @@ bool DtcImpl::{{ dt.nameFlc }}s(const std::function<bool(const ::{{ namespace }}
   if (!is{{ dt.name }}Enabled())
   {
     enable{{ dt.name }}();
-    DEBUG_LOG(*m_logger) << "NEED TO ENABLE ! {{ dt.name }}" ;
+    DEBUG_LOG(m_logger) << "NEED TO ENABLE ! {{ dt.name }}" ;
     waitForHistoricalData{{ dt.name }}(10);
   }
   return getOne(m_dtc{{ dt.name }}, m_{{ dt.nameFlc }}Cont, {{ dt.key.nameFlc }});

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_dtc_impl.h.grantlee

@@ -95,7 +95,7 @@ protected:
   ::{{ namespace }}::{{ dt.type }} m_{{ dt.nameFlc }};
 {% endif %} {% endif %} {% endfor %}
 
-  NGL::INGLLogger* m_logger;
+  LOGGER_T m_logger;
 
 signals:
 {% for dt in dataTopics.member %}

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_dts_impl.cpp.grantlee

@@ -25,7 +25,7 @@ std::shared_ptr<Dts> Dts::create(const std::shared_ptr<DDSConnector::DdsConnecto
 DtsImpl::DtsImpl(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : Dts()
   , m_ddsConnector(ddsConnector)
-  , m_logger(&getLogger("Dts"))
+  , m_logger(getLogger("Dts"))
 {}
 
 DtsImpl::~DtsImpl()
@@ -38,7 +38,7 @@ bool DtsImpl::enableAll(bool enable)
   {% for dt in dataTopics.member %} {% if dt.dtsImpl %}
   if (!enable{{ dt.name }}(enable))
   {
-    WARNING_LOG(*m_logger) << "Error initializing data topic {{ dt.name }}";
+    WARNING_LOG(m_logger) << "Error initializing data topic {{ dt.name }}";
     return false;
   }
   {% endif %} {% endfor %}
@@ -55,7 +55,7 @@ bool DtsImpl::enable{{ dt.name }}(bool enable)
   {
     if (m_dts{{ dt.name }})
     {
-      INFO_LOG(*m_logger) << "{{ ft.name }} already enabled!";
+      INFO_LOG(m_logger) << "{{ ft.name }} already enabled!";
       return true;
     }
     m_dts{{ dt.name }}.reset(m_ddsConnector->createDTS<DTS::{{ dt.name }}Impl>());
@@ -72,7 +72,7 @@ bool DtsImpl::publish(const {{ namespace }}::{{ dt.type }} &data)
 {
   if (!m_dts{{ dt.name }})
   {
-    WARNING_LOG(*m_logger) << "Error publishing data topic {{ dt.name }} - not enabled";
+    WARNING_LOG(m_logger) << "Error publishing data topic {{ dt.name }} - not enabled";
     Q_ASSERT(false);
     return false;
   }
@@ -84,11 +84,13 @@ bool DtsImpl::remove{{ dt.name }}ByKey({{ dt.key.cppTypeCr }} {{ dt.key.nameFlc
 {
   if (!m_dts{{ dt.name }})
   {
-    WARNING_LOG(*m_logger) << "Error removing data topic {{ dt.name }} - not enabled";
+    WARNING_LOG(m_logger) << "Error removing data topic {{ dt.name }} - not enabled";
     Q_ASSERT(false);
     return false;
   }
   {{ namespace }}::{{ dt.name }} data;
+  // rtiddsgen -stl generates plain public data members, so the key is
+  // assigned directly instead of the old setter call data.{{ dt.key.name }}(...).
   data.{{ dt.key.name }} = {{ dt.key.name }};
   return m_dts{{ dt.name }}->remove(data, errorMsgIfSampleDoesNotExists);
 }

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_dts_impl.h.grantlee

@@ -50,7 +50,7 @@ protected:
   {% for dt in dataTopics.member %} {% if dt.dtsImpl %}
   std::unique_ptr<DTS::{{ dt.name }}> m_dts{{ dt.name }};
   {% endif %} {% endfor %}
-  NGL::INGLLogger* m_logger;
+  LOGGER_T m_logger;
 };
 
 } // namespace Interface

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_ftc_impl.cpp.grantlee

@@ -46,21 +46,21 @@ Q_DECL_EXPORT std::shared_ptr<Ftc> Ftc::create(const std::shared_ptr<DDSConnecto
 
   auto ret = std::make_shared<FtcImpl>(ddsConnector);
   s_availableConnectors.insert(std::make_pair(ddsConnector.get(), ret));
-  return std::move(ret);  // c++11 defect
+  return ret;  // moved implicitly (C++17; explicit std::move on a local triggers -Wredundant-move)
 }
 
 // FtcImpl
 FtcImpl::FtcImpl(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : Ftc()
   , m_ddsConnector(ddsConnector)
-  , m_logger(&getLogger("Ftc"))
+  , m_logger(getLogger("Ftc"))
 {}
 
 bool FtcImpl::enableAll(bool enable)
 { {% for ft in functionTopics.member %}
   if (!enable{{ ft.name }}(enable))
   {
-    ERROR_LOG(*m_logger) << "Error initializing function topic {{ ft.name }}";
+    ERROR_LOG(m_logger) << "Error initializing function topic {{ ft.name }}";
     return false;
   }
   {% endfor %}
@@ -80,7 +80,7 @@ bool FtcImpl::enable{{ ft.name }}(bool enable)
   {
     if (m_ftc{{ ft.name }})
     {
-      INFO_LOG(*m_logger) << "{{ ft.name }} already enabled!";
+      INFO_LOG(m_logger) << "{{ ft.name }} already enabled!";
       return true;
     }
     m_ftc{{ ft.name }}.reset(
@@ -116,17 +116,9 @@ static T buildErrorReason(int reason, int requestId)
   }
 
   T reply;
-{% if ft.isCoreFt %}
-  reply.setId(requestId);
-  reply.setStr(errString.c_str());
-  for (const auto& arg : errArgs)
-    reply.arg(arg);
-{% else %}
   reply.id = requestId;
-  reply.errorString = errString.c_str();
-  for (const auto& arg : errArgs)
-    reply.errorParams.push_back(arg);
-{% endif %}
+  reply.errorString = errString;
+  reply.errorParams = errArgs;
   return reply;
 }
 
@@ -143,7 +135,7 @@ int64_t FtcImpl::{{ ft.requestFlc }}(const {{ ft.requestType }} &request, const
 {
   if (!m_ftc{{ ft.name }})
   {
-    WARNING_LOG(*m_logger) << "Error requesting function topic {{ ft.name }} - not enabled";
+    WARNING_LOG(m_logger) << "Error requesting function topic {{ ft.name }} - not enabled";
     Q_ASSERT(false);
     return 0;
   }
@@ -203,17 +195,14 @@ int64_t FtcImpl::{{ ft.requestFlc }}(const {{ ft.requestType }} &request, const
 {% if ft.isCoreFt %}
   const auto _reply = future.get(); // throws if exception set
 
-  Core::FunctionReplyObject fro;
-  fro.setId(_reply.id);
-  fro.setStr(_reply.errorString.c_str());
-  for (const auto& arg : _reply.errorParams)
-    fro.arg(arg);
-  fro.setAdditionalInfo(_reply.additionalInfo.c_str());
+  Core::FunctionReplyObject fro(
+    {% for rp in ft.replyParams %} _reply.{{ rp.nameGetter }}{% if not forloop.last %},{% endif %} {% endfor %}
+  );
   fro.setUniqueId(m_last{{ ft.request }}UniqueId);
 
   if (fro.error())
   {
-    ERROR_LOG(*m_logger) << "FTC call failed: " << fro.translated();
+    ERROR_LOG(m_logger) << "FTC call failed: " << fro.translated();
     throw std::runtime_error(fro.translated().toStdString().c_str());
   }
 
@@ -230,7 +219,7 @@ void FtcImpl::{{ ft.onReply }}(const {{ namespace }}::{{ ft.reply }} &reply, int
   auto it = m_{{ ft.replyHandlerFlc }}.find(uniqueId);
   if (it == m_{{ ft.replyHandlerFlc }}.end())
   {
-    WARNING_LOG(*m_logger) << "Error replying function topic {{ ft.name }} - no replyHandler";
+    WARNING_LOG(m_logger) << "Error replying function topic {{ ft.name }} - no replyHandler";
     Q_ASSERT(false);
     return;
   }
@@ -243,12 +232,10 @@ void FtcImpl::{{ ft.onReply }}(const {{ namespace }}::{{ ft.reply }} &reply, int
 
   m_last{{ ft.request }}UniqueId = uniqueId + {{ ft.replyHandlerHash }};
 {% if ft.isCoreFt %}
-  Core::FunctionReplyObject fro;
-  fro.setId(reply.id);
-  fro.setStr(reply.errorString.c_str());
-  for (const auto& arg : reply.errorParams)
-    fro.arg(arg);
-  fro.setAdditionalInfo(reply.additionalInfo.c_str());
+  Core::FunctionReplyObject fro(
+      {% for rp in ft.replyParams %}
+      reply.{{ rp.nameGetter }}{% if not forloop.last %},{% endif %} {% endfor %}
+  );
   fro.setUniqueId(m_last{{ ft.request }}UniqueId);
   cb(fro);
 {% else %}

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_ftc_impl.h.grantlee

@@ -74,7 +74,7 @@ private:
 
 private:
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
-  NGL::INGLLogger* m_logger;
+  LOGGER_T m_logger;
 };
 } // namespace Interface
 } // namespace {{ namespace }}

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_fts_impl.cpp.grantlee

@@ -24,7 +24,7 @@ std::shared_ptr<Fts> Fts::create(const std::shared_ptr<DDSConnector::DdsConnecto
 FtsImpl::FtsImpl(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : Fts()
   , m_ddsConnector(ddsConnector)
-  , m_logger(&getLogger("Fts"))
+  , m_logger(getLogger("Fts"))
 {}
 
 FtsImpl::~FtsImpl()
@@ -34,11 +34,11 @@ FtsImpl::~FtsImpl()
 
 bool FtsImpl::enableAll(bool enable)
 {
-  DEBUG_LOG(*m_logger) << "FtsImpl::enableAll(" << (enable ? "true" : "false") << ")";
+  DEBUG_LOG(m_logger) << "FtsImpl::enableAll(" << (enable ? "true" : "false") << ")";
   {% for ft in functionTopics.member %}
   if (!enable{{ ft.name }}(enable))
   {
-    ERROR_LOG(*m_logger) << "Error initializing function topic {{ ft.name }}";
+    ERROR_LOG(m_logger) << "Error initializing function topic {{ ft.name }}";
     return false;
   }
   {% endfor %}
@@ -55,7 +55,7 @@ bool FtsImpl::enable{{ ft.name }}(bool enable)
   {
     if (m_fts{{ ft.name }})
     {
-      INFO_LOG(*m_logger) << "{{ ft.name }} already enabled!";
+      INFO_LOG(m_logger) << "{{ ft.name }} already enabled!";
       return true;
     }
     m_fts{{ ft.name }}.reset(m_ddsConnector->createFTS<FTS::{{ ft.name }}>());
@@ -73,7 +73,7 @@ bool FtsImpl::{{ ft.replyFlc }}(const rti::core::SampleIdentity &cookie, const {
 {
   if (!m_fts{{ ft.name }})
   {
-    WARNING_LOG(*m_logger) << "Error publishing function topic {{ dt.name }} - not enabled";
+    WARNING_LOG(m_logger) << "Error publishing function topic {{ dt.name }} - not enabled";
     Q_ASSERT(false);
     return false;
   }
@@ -96,10 +96,10 @@ void FtsImpl::set{{ ft.requestHandler }}({{ ft.requestHandler }} *handler)
 void FtsImpl::{{ ft.onRequest }}(const rti::core::SampleIdentity &cookie,
                                  const {{ namespace }}::{{ ft.request }} &request)
 {
-  DEBUG_LOG(*m_logger) << "{{ ft.onRequest }}";
+  DEBUG_LOG(m_logger) << "{{ ft.onRequest }}";
   if (!m_{{ ft.requestHandlerFlc }})
   {
-    WARNING_LOG(*m_logger) << "Incoming {{ ft.request }} without registered handler!";
+    WARNING_LOG(m_logger) << "Incoming {{ ft.request }} without registered handler!";
     Q_ASSERT(false);
     return;
   }

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_fts_impl.h.grantlee

@@ -59,7 +59,7 @@ private:
 private:
 
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
-  NGL::INGLLogger* m_logger;
+  LOGGER_T m_logger;
 };
 
 } // namespace Interface

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_json.cpp.grantlee

@@ -48,6 +48,18 @@ QJsonValue toJson(qint64 vec)
 {
   return QJsonValue(QString::number(vec));
 }
+// IDL 64-bit integers map to int64_t, which is 'long' on LP64 and therefore
+// distinct from qint64 ('long long'); without this overload the generic
+// toJson(std::vector<T>) is ambiguous for sequence<int64_t> members.
+QJsonValue toJson(long vec)
+{
+  return QJsonValue(QString::number(vec));
+}
+template<>
+long fromJson(const QJsonValue &val, type<long>)
+{
+  return val.toString().toLong();
+}
 
 // std::string
 QJsonValue toJson(const std::string &element)

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_record_replay_plugin.cpp.grantlee

@@ -171,8 +171,20 @@ std::vector<T> fromJson(const QVariant &jsonData, type<std::vector<T>>)
   return ret;
 }
 
+// Primary fallback for any migrated plain-`enum class` enumerators that have no
+// explicit specialization below - most importantly the nested foreign
+// ProjectDataManagement / Core enums a plugin reads back from the database (they are
+// not in this service's idl_enums, so the per-own-enum specializations do not cover
+// them). Giving the primary template a body (rather than leaving it declaration-only)
+// is what lets those foreign-enum instantiations resolve, so the plugin .so links. The
+// explicit specializations for primitives / own enums / structs / vectors / optionals
+// all take precedence over this fallback, so it is only ever instantiated for an enum
+// type, where `static_cast<T>(val.toInt())` is the correct conversion.
 template<typename T>
-T fromQVariant(const QVariant &val, type<T>);
+T fromQVariant(const QVariant &val, type<T>)
+{
+  return static_cast<T>(val.toInt());
+}
 
 template<>
 bool fromQVariant(const QVariant &val, type<bool>)
@@ -198,6 +210,17 @@ long long fromQVariant(const QVariant &val, type<long long>)
   return val.toLongLong();
 }
 
+// rtiddsgen 4.7 spells the 64 bit integer members int64_t, which is `long` on LP64 and thus
+// a different type from the Qt side's qint64 (`long long`). The tag dispatch above is keyed on
+// the exact type, so the generated type needs its own conversion even though the two are the
+// same width. GrantleeWrappers::cppDdsType() names the generated member type, so this is the
+// overload the record replay code instantiates for those members.
+template<>
+int64_t fromQVariant(const QVariant &val, type<int64_t>)
+{
+  return static_cast<int64_t>(val.toLongLong());
+}
+
 template<>
 double fromQVariant(const QVariant &val, type<double>)
 {
@@ -255,6 +278,23 @@ T fromQVariant(const QVariant &val)
   return fromQVariant(val, type<T>{});
 }
 
+// rtiddsgen 7.7 spells the migrated enumerators as plain `enum class` in the service
+// namespace (the legacy dds::core::safe_enum<T> wrapper is gone). The record_replay
+// plugin still instantiates fromQVariant<Enum>() for each enum member it reads back,
+// and none of the generic overloads above are ever deduced for those types, so each of
+// this service's own enumerations needs its own explicit specialization. `idl_enums`
+// carries the service's own enumerations by local name and this block runs inside
+// `namespace {{ namespace }}`, so the local name resolves to the fully-qualified enum
+// type. (Nested foreign PDM enumerations are still not covered - same limitation as the
+// documented svcBuildings exclusion.)
+{% for enumeration in idl_enums %}
+template<>
+{{ enumeration.name }} fromQVariant(const QVariant &val, type<{{ enumeration.name }}>)
+{
+  return static_cast<{{ enumeration.name }}>(val.toInt());
+}
+{% endfor %}
+
 {% for dt in serializeTopics.member %}
 //
 // Begin {{ dt.typeFq }}
@@ -338,7 +378,7 @@ RecordReplayPlugin::RecordReplayPlugin()
   : m_exerciseId(0)
   , m_bCanHandleSchemasRead(true)
   , m_bCanHandleSchemasWrite(true)
-  , m_logger(&getLogger("RecordReplay"))
+  , m_logger(getLogger("RecordReplay"))
 {}
 
 RecordReplayPlugin::~RecordReplayPlugin() = default;
@@ -465,7 +505,7 @@ std::map<QString, std::vector<RecordReplayPlugin::RecSnapshot>> RecordReplayPlug
       {
         // the current snapshot data does not match the starting time -> reread m_{{ dt.nameFlc }}Keys
         readLastSnapshotKeysFor{{ dt.name }}(q, nextSampleTime);
-        //DEBUG_LOG(*m_logger) << "fromTime: " << fromTime << ", m_snapshotParticipantMapTime: " << m_snapshotParticipantMapTime
+        //DEBUG_LOG(m_logger) << "fromTime: " << fromTime << ", m_snapshotParticipantMapTime: " << m_snapshotParticipantMapTime
         //                    << " - rereading snapshot times! Map now contains " << m_snapshot{{ dt.name }}Map.size() << " entries";
       }
 
@@ -541,7 +581,7 @@ bool RecordReplayPlugin::write{{ dt.name }}(NSqlQuery &q, QHash<QString, qint64>
 
   if (m_dtc{{ dt.name }}->hasSamples())
   {
-    TRACE_LOG(*m_logger) << "m_dtc{{ dt.name }}->hasSamples() == true ";
+    TRACE_LOG(m_logger) << "m_dtc{{ dt.name }}->hasSamples() == true ";
 
     const QString stmt(QStringLiteral("INSERT INTO ") + getTableName(QStringLiteral("{{ dt.recTable.name }}"), m_bCanHandleSchemasWrite) +
                        QStringLiteral(" ( dds_is_alive, {% for row in dt.recTable.cppMember %} {{ row.dbColumnName }}{% if not forloop.last %}, {% endif %}{% endfor %}) VALUES "
@@ -551,11 +591,11 @@ bool RecordReplayPlugin::write{{ dt.name }}(NSqlQuery &q, QHash<QString, qint64>
       return false;
 
     dds::sub::LoanedSamples<DATA> samples = m_dtc{{ dt.name }}->takeAlive();
-    TRACE_LOG(*m_logger) << "samples count: " << samples.length();
+    TRACE_LOG(m_logger) << "samples count: " << samples.length();
     for (const auto &sample : samples)
     {
       const DATA &data = sample.data();
-      INFO_LOG(*m_logger) << "m_dtc{{ dt.name }} {{ dt.recTable.ddsKey.cppMemberName }}: "  << data.{{ dt.recTable.ddsKey.cppMemberName }}();
+      INFO_LOG(m_logger) << "m_dtc{{ dt.name }} {{ dt.recTable.ddsKey.cppMemberName }}: "  << data.{{ dt.recTable.ddsKey.cppMemberName }};
 
       {% for row in dt.recTable.cppMember %}
       q.bindValue(QStringLiteral(":{{ row.dbColumnName }}"), {{ row.ddsToQVariant }});
@@ -565,7 +605,10 @@ bool RecordReplayPlugin::write{{ dt.name }}(NSqlQuery &q, QHash<QString, qint64>
       if (!q.exec())
         return false;
 
-      minRecordSampleTime = std::min(minRecordSampleTime, data.sampleTime());
+      // rtiddsgen 4.7 declares sample_time as int64_t (long), while the record
+      // boundary is qint64 (long long); std::min requires both arguments to be
+      // the same type, so narrow the generated member explicitly.
+      minRecordSampleTime = std::min(minRecordSampleTime, static_cast<qint64>(data.sampleTime));
     }
   }
 
@@ -579,7 +622,7 @@ bool RecordReplayPlugin::write{{ dt.name }}(NSqlQuery &q, QHash<QString, qint64>
     if (!q.prepare(stmt))
       return false;
 
-    DEBUG_LOG(*m_logger) << "disposedSamples count: " << disposedSamples.length();
+    DEBUG_LOG(m_logger) << "disposedSamples count: " << disposedSamples.length();
     auto dr = m_dtc{{ dt.name }}->dataReader()->dataReader();
     {{ dt.name }} data;
     for (const auto &sample : disposedSamples)
@@ -615,12 +658,12 @@ bool RecordReplayPlugin::readLastSnapshotFor{{ dt.name }}(NSqlQuery &q, qint64 s
 
   if (!q.exec(stmt))
   {
-     ERROR_LOG(*m_logger) << "Error while fetch max(time_stamp) for topic {{ dt.name }}";
+     ERROR_LOG(m_logger) << "Error while fetch max(time_stamp) for topic {{ dt.name }}";
      return false;
   }
   if (!q.next() || q.value(0).isNull())
   {
-    INFO_LOG(*m_logger) << "No snapshot available for topic {{ dt.name }}";
+    INFO_LOG(m_logger) << "No snapshot available for topic {{ dt.name }}";
     return true;
   }
   const qint64 idSnapshot = q.value(0).toLongLong();
@@ -645,10 +688,10 @@ bool RecordReplayPlugin::readLastSnapshotFor{{ dt.name }}(NSqlQuery &q, qint64 s
     {% endfor %}
 
     if (bIsAlive)
-      m_{{ dt.nameFlc }}Map.insert(data.sampleTime(), data);
+      m_{{ dt.nameFlc }}Map.insert(data.sampleTime, data);
     else
-      m_{{ dt.nameFlc }}DisposedMap.insert(data.sampleTime(), data);
-    m_{{ dt.nameFlc }}Keys.insert(data.{{ dt.key.name }}());
+      m_{{ dt.nameFlc }}DisposedMap.insert(data.sampleTime, data);
+    m_{{ dt.nameFlc }}Keys.insert(data.{{ dt.key.name }});
   }
   m_snapshot{{ dt.name }}MapTime = timeSnapshot;
 
@@ -677,10 +720,10 @@ bool RecordReplayPlugin::read{{ dt.name }}(NSqlQuery &q, qint64 fromTime, qint64
     {% endfor %}
 
     if (bIsAlive)
-      m_{{ dt.nameFlc }}Map.insert(data.sampleTime(), data);
+      m_{{ dt.nameFlc }}Map.insert(data.sampleTime, data);
     else
-      m_{{ dt.nameFlc }}DisposedMap.insert(data.sampleTime(), data);
-    m_{{ dt.nameFlc }}Keys.insert(data.{{ dt.key.name }}());
+      m_{{ dt.nameFlc }}DisposedMap.insert(data.sampleTime, data);
+    m_{{ dt.nameFlc }}Keys.insert(data.{{ dt.key.name }});
   }
   return true;
 }
@@ -693,7 +736,7 @@ bool RecordReplayPlugin::updateSnapshotKeys{{ dt.name }}(NSqlQuery &q, qint64 fr
                      QStringLiteral(" AND sample_time <= ") + QString::number(toTime) +
                      QStringLiteral(" ORDER BY sample_time "));
 
-  DEBUG_LOG(*m_logger) << "stmt: " << stmt;
+  DEBUG_LOG(m_logger) << "stmt: " << stmt;
 
   if (!q.exec(stmt))
     return false;
@@ -705,13 +748,13 @@ bool RecordReplayPlugin::updateSnapshotKeys{{ dt.name }}(NSqlQuery &q, qint64 fr
     const bool isAlive = q.value(2).toBool();
     if (isAlive)
     {
-      DEBUG_LOG(*m_logger) << "INSERT {{ dt.name }} key: " << key << ", pk: " << pk << ", isAlive: " << isAlive;
+      DEBUG_LOG(m_logger) << "INSERT {{ dt.name }} key: " << key << ", pk: " << pk << ", isAlive: " << isAlive;
       m_snapshot{{ dt.name }}Map[key] = pk;
       m_{{ dt.nameFlc }}Keys.insert(key);
     }
     else
     {
-      DEBUG_LOG(*m_logger) << "REMOVE {{ dt.name }} key: " << key << ", pk: " << pk << ", isAlive: " << isAlive;
+      DEBUG_LOG(m_logger) << "REMOVE {{ dt.name }} key: " << key << ", pk: " << pk << ", isAlive: " << isAlive;
       m_snapshot{{ dt.name }}Map.erase(key);
       m_{{ dt.nameFlc }}Keys.erase(key);
     }
@@ -720,7 +763,7 @@ bool RecordReplayPlugin::updateSnapshotKeys{{ dt.name }}(NSqlQuery &q, qint64 fr
   // new validity time for snapshot data
   m_snapshot{{ dt.name }}MapTime = toTime;
 
-  DEBUG_LOG(*m_logger) << "updateSnapshotKeys{{ dt.name }}(" << fromTime << ", " << toTime << ") = "
+  DEBUG_LOG(m_logger) << "updateSnapshotKeys{{ dt.name }}(" << fromTime << ", " << toTime << ") = "
                       << m_snapshot{{ dt.name }}Map.size();
 
   return true;
@@ -737,13 +780,13 @@ bool RecordReplayPlugin::readLastSnapshotKeysFor{{ dt.name }}(NSqlQuery &q, qint
     return false;
   if (!q.next() || q.value(0).isNull())
   {
-    DEBUG_LOG(*m_logger) << "no snapshot entry for {{ dt.name }} found";
+    DEBUG_LOG(m_logger) << "no snapshot entry for {{ dt.name }} found";
     return true;
   }
 
   m_snapshot{{ dt.name }}Map = LtsUtils::BigintArray2D::fromPgString(q.value(0).toString())();
 
-  DEBUG_LOG(*m_logger) << "Map size {{ dt.name }}: " << m_snapshot{{ dt.name }}Map.size();
+  DEBUG_LOG(m_logger) << "Map size {{ dt.name }}: " << m_snapshot{{ dt.name }}Map.size();
 
   return true;
 }
@@ -758,7 +801,7 @@ qint64 RecordReplayPlugin::getNextSampleTimeFor{{ dt.name }}(NSqlQuery &q, qint6
   if (q.execAndFetch(stmt) && !q.value(0).isNull())
     ret = q.value(0).toLongLong();
 
-  DEBUG_LOG(*m_logger) << "next min sampleTime for {{ dt.name }} is " << ret << " (> " << fromTime << ")";
+  DEBUG_LOG(m_logger) << "next min sampleTime for {{ dt.name }} is " << ret << " (> " << fromTime << ")";
 
   return ret;
 }
@@ -795,7 +838,7 @@ void RecordReplayPlugin::clearData{{ dt.name }}()
     {{ dt.name }} tmpData;
     for (auto key : m_{{ dt.nameFlc }}Keys)
     {
-      tmpData.{{ dt.key.name }}(key);
+      tmpData.{{ dt.key.name }} = key;
       m_dts{{ dt.name }}->remove(tmpData);
     }
   }
@@ -812,12 +855,12 @@ bool RecordReplayPlugin::copyInitialData{{ dt.name }}(NSqlQuery &queryFrom, NSql
 
   if (!queryFrom.exec(stmt))
   {
-     ERROR_LOG(*m_logger) << "Error while fetch max(time_stamp) for topic {{ dt.name }}";
+     ERROR_LOG(m_logger) << "Error while fetch max(time_stamp) for topic {{ dt.name }}";
      return false;
   }
   if (!queryFrom.next() || queryFrom.value(0).isNull())
   {
-    INFO_LOG(*m_logger) << "No snapshot available for topic {{ dt.name }}";
+    INFO_LOG(m_logger) << "No snapshot available for topic {{ dt.name }}";
     return true;
   }
   const qint64 idSnapshot = queryFrom.value(0).toLongLong();

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_record_replay_plugin.h.grantlee

@@ -18,8 +18,10 @@
 #include <{{ include_prefix }}/{{ namespace_abbr }}_dts_types.h>
 #include <{{ include_prefix }}/logger.h>
 
-// TODO: Problem with QT5_WRAP_CPP ...
-#include <../../Common/PluginInterfaces/record_replay_plugin.h>
+// Resolved from the Lts include root (see include_directories(BEFORE .../Lts)
+// in the root CMakeLists); the old <../../Common/...> spelling only worked
+// for in-source builds.
+#include <Common/PluginInterfaces/record_replay_plugin.h>
 
 #include <LtsUtilsCore/pgarray.h>
 
@@ -119,7 +121,7 @@ protected:
   int64_t                                                m_snapshot{{ dt.name }}MapTime = -1;  // time for which the snapshot is valid
 {% endif %} {% endfor %}
 
-  NGL::INGLLogger*                                         m_logger;
+  NGL::INGLLogger&                                         m_logger;
 };
 
 }

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_topic_type_plugin.h.grantlee

@@ -15,8 +15,10 @@
 #include <Common/ProjectConfig/project_defines.h>
 
 #include <QtCore/QObject>
-// TODO: Problem with QT5_WRAP_CPP ...
-#include <../../DDS/Generic/topic_type_plugin.h>
+// Resolved from the Lts include root (see include_directories(BEFORE .../Lts)
+// in the root CMakeLists); the old <../../DDS/...> spelling only worked for
+// in-source builds because moc/gcc do not resolve it relative to this file.
+#include <DDS/Generic/topic_type_plugin.h>
 
 namespace {{ namespace }}
 {

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_translation.h.grantlee

@@ -12,7 +12,7 @@
 // filename: {{ namespace_abbr }}_translation.h
 
 #include <string>
-#include <{{ namespace_abbr }}_enums.hpp>
+#include <{{ include_prefix }}/{{ namespace_abbr }}_enums.hpp>
 #include <{{ include_prefix }}/{{ namespace_abbr }}_export.h>
 
 class QString;

qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/lts_app_descriptor.cpp

@@ -113,7 +113,7 @@ AppDescriptionVector LtsAppDescriptor::getAppDescriptionVector(const QByteArray&
         int column = 0;
         QChar x = QLatin1Char('\n');
 
-        for (int i = 0; i < jsonDocument.count(); i++)
+        for (int i = 0; i < jsonDocument.size(); i++)
         {
             if (i == parseError.offset)
                 break;

qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/lts_app_manager.cpp

@@ -140,7 +140,7 @@ void LtsAppManager::slotStartDebugServer()
             QString commandStr(
                 QString::fromUtf8(client->readLine(100)).remove(QStringLiteral("\r")).remove(QStringLiteral("\n")));
 
-            QStringList argList = commandStr.split(QLatin1Char(' '), QString::SplitBehavior::SkipEmptyParts);
+            QStringList argList = commandStr.split(QLatin1Char(' '), Qt::SkipEmptyParts);
 
             if (argList.count() < 1)
                 return;

qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coord_vector.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "ltscoordinate_export.h"
+#include <LtsCoordinate/ltscoordinate_export.h>
 
 #include <Core/core.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
@@ -48,7 +48,7 @@ class LTSCOORDINATE_EXPORT LtsCoordVector
         utmVectorRef.reserve(m_geo_coordinates.size());
 
         for (const auto& geoCoord : std::as_const(m_geo_coordinates))
-            utmVectorRef.push_back(LtsCoordTrans::UtmCoordinate::fromGeographic(geoCoord.lon(), geoCoord.lat(), zone));
+            utmVectorRef.push_back(LtsCoordTrans::UtmCoordinate::fromGeographic(geoCoord.lon, geoCoord.lat, zone));
     }
 
   protected:

qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coordinate.cpp

@@ -29,13 +29,13 @@ double LtsCoordinate::elevationAt(double defaultElevation, bool* bIsCovered) con
         if (!std::isnan(m_elevation))
             return m_elevation;
     if (m_getElevationCB)
-        m_elevation = m_getElevationCB(m_geo.lon(), m_geo.lat(), defaultElevation, bIsCovered);
+        m_elevation = m_getElevationCB(m_geo.lon, m_geo.lat, defaultElevation, bIsCovered);
     return m_elevation;
 }
 
 void LtsCoordinate::setZValueAccordingElevation(double defaultElevation)
 {
-    m_geo.z(elevationAt(defaultElevation));
+    m_geo.z = elevationAt(defaultElevation);
 }
 
 double LtsCoordinate::elevationAt(const LtsCoordinate& coordinate, double defaultElevation, bool* bIsCovered)
@@ -46,7 +46,7 @@ double LtsCoordinate::elevationAt(const LtsCoordinate& coordinate, double defaul
 void LtsCoordinate::replaceZValueByElevationIfValue(double zValueToBeReplaced, double defaultElevation)
 {
 
-    if ((std::isnan(zValueToBeReplaced) && std::isnan(m_geo.z())) || qFuzzyCompare(m_geo.z(), zValueToBeReplaced))
+    if ((std::isnan(zValueToBeReplaced) && std::isnan(m_geo.z)) || qFuzzyCompare(m_geo.z, zValueToBeReplaced))
         setZValueAccordingElevation(defaultElevation);
 }
 
@@ -79,7 +79,7 @@ void LtsCoordinate::convertGeoToUtm() const
 
     int zone = -1;
 
-    if (std::isnan(m_geo.lon()) || std::isnan(m_geo.lat()))
+    if (std::isnan(m_geo.lon) || std::isnan(m_geo.lat))
     {
         fprintf(stderr, "Error while fromGeographic, value is NaN\n");
         m_utm2D = LtsCoordTrans::UtmCoordinate();
@@ -90,7 +90,7 @@ void LtsCoordinate::convertGeoToUtm() const
     ++s_conversion_counter;
 #endif
 
-    m_utm2D = LtsCoordTrans::UtmCoordinate::fromGeographic(m_geo.lon(), m_geo.lat(), zone);
+    m_utm2D = LtsCoordTrans::UtmCoordinate::fromGeographic(m_geo.lon, m_geo.lat, zone);
     Q_ASSERT_X(m_utm2D.zone > 0, "LtsCoordinate", "zone has to be set");
 }
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/lts_coordinate.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "ltscoordinate_export.h"
+#include <LtsCoordinate/ltscoordinate_export.h>
 
 #include <Core/core.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
@@ -35,7 +35,7 @@ class LTSCOORDINATE_EXPORT LtsCoordinate
 
     explicit LtsCoordinate(const Core::GeoPosition& geoPos) : m_geo(geoPos) {}
 
-    explicit LtsCoordinate(const Core::GeoPosition2D& geoPos2D) : m_geo(geoPos2D.lon(), geoPos2D.lat(), std::nan("")) {}
+    explicit LtsCoordinate(const Core::GeoPosition2D& geoPos2D) : m_geo(geoPos2D.lon, geoPos2D.lat, std::nan("")) {}
 
     LtsCoordinate(const LtsCoordTrans::UtmCoordinate& utm2D, double zValue) = delete;
 
@@ -67,7 +67,7 @@ class LTSCOORDINATE_EXPORT LtsCoordinate
 
     bool hasGeo() const
     {
-        return !(valueIsNullOrNan(m_geo.lon()) || valueIsNullOrNan(m_geo.lat()));
+        return !(valueIsNullOrNan(m_geo.lon) || valueIsNullOrNan(m_geo.lat));
     }
 
     bool hasUtm() const
@@ -95,7 +95,7 @@ class LTSCOORDINATE_EXPORT LtsCoordinate
 
     Core::GeoPosition2D geoPosition2D() const
     {
-        return Core::GeoPosition2D(m_geo.longitude, m_geo.latitude);
+        return Core::GeoPosition2D(m_geo.lon, m_geo.lat);
     }
 
     const LtsCoordTrans::UtmCoordinate& utmCoordinate() const
@@ -107,23 +107,23 @@ class LTSCOORDINATE_EXPORT LtsCoordinate
 
     double& rz()
     {
-        return m_geo.altitude;
+        return m_geo.z;
     }
 
     double z() const
     {
-        return m_geo.z();
+        return m_geo.z;
     }
 
     void setZ(double value)
     {
-        m_geo.z(value);
+        m_geo.z = value;
     }
 
     LtsCoordTrans::UtmCoordinate utmCoordinateDiffZone(int zone) const
     {
 
-        m_utm2D_differentZone = LtsCoordTrans::UtmCoordinate::fromGeographic(m_geo.lon(), m_geo.lat(), zone);
+        m_utm2D_differentZone = LtsCoordTrans::UtmCoordinate::fromGeographic(m_geo.lon, m_geo.lat, zone);
         return m_utm2D_differentZone;
     }
 
@@ -146,17 +146,17 @@ class LTSCOORDINATE_EXPORT LtsCoordinate
 
     QPointF toGeoPointF() const
     {
-        return QPointF(m_geo.lon(), m_geo.lat());
+        return QPointF(m_geo.lon, m_geo.lat);
     }
 
     QPoint3D toGeoPoint3D() const
     {
-        return QPoint3D(m_geo.lon(), m_geo.lat(), m_geo.z());
+        return QPoint3D(m_geo.lon, m_geo.lat, m_geo.z);
     }
 
     UtmCoordinate3D toUtmCoordinate3D() const
     {
-        return UtmCoordinate3D(utmCoordinate(), m_geo.z());
+        return UtmCoordinate3D(utmCoordinate(), m_geo.z);
     }
 
     using elevationCbFunc = std::function<double(double, double, double, bool*)>;
@@ -174,7 +174,7 @@ class LTSCOORDINATE_EXPORT LtsCoordinate
 
     double heightOverElevation() const
     {
-        return m_geo.z() - elevationAt();
+        return m_geo.z - elevationAt();
     }
 
     double distanceUtm2D(const LtsCoordinate& other) const
@@ -203,13 +203,13 @@ class LTSCOORDINATE_EXPORT LtsCoordinate
     void clearGeo() const
     {
         clearGeoLonLat();
-        m_geo.z(std::nan(""));
+        m_geo.z = std::nan("");
     }
 
     void clearGeoLonLat() const
     {
-        m_geo.lon(0);
-        m_geo.lat(0);
+        m_geo.lon = 0;
+        m_geo.lat = 0;
     }
 
     void clearUtm() const
@@ -245,7 +245,7 @@ class LTSCOORDINATE_EXPORT LtsCoordinate
         const auto& utmTemp = utmCoordinateInternal(zone);
         pntRef.rx() = utmTemp.x;
         pntRef.ry() = utmTemp.y;
-        pntRef.rz() = m_geo.z();
+        pntRef.rz() = m_geo.z;
     }
 
   protected:

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

@@ -31,9 +31,6 @@ if(QT6_GUI_AVAILABLE)
     PRIVATE
       NGLLogger
   ##    LtsSessionDataDds
-  ##    ExmDataPluginInterface                    # External dependency - missing
-  ##    situationMapCommon                        # External dependency - missing
-  ##    situationMapElevationMap                  # External dependency - missing
     PUBLIC
       LtsUtilsCoreHeaderOnly
       Qt6::Core
@@ -42,7 +39,14 @@ if(QT6_GUI_AVAILABLE)
 endif()
 
 if(BUILD_RTI)
-  target_link_libraries(LtsElevation PRIVATE AsmDataPluginInterface)
+  # All ElevationMapManager / resource_path / exm-dtc usages live inside
+  # #ifdef BUILD_RTI in lts_elevation_manager.cpp (Qt5 dependencies restored).
+  target_link_libraries(LtsElevation PRIVATE
+    AsmDataPluginInterface
+    ExmDataPluginInterface
+    situationMapCommon
+    situationMapElevationMap
+  )
 endif()
 
 ADD_SUBDIRECTORY(UnitTest_Elevation)

qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/lts_elevation_manager.cpp

@@ -6,6 +6,12 @@
 #include <AssetManagement/asm_data_plugin_interface.h>
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 #include <Viewer/SituationMap/ElevationMap/elevation_map_manager.h>
+#include <Viewer/SituationMap/Common/resource_path.h>
+
+#include <QDir>
+#include <QHash>
+#include <QSharedPointer>
+#include <QUrl>
 
 static_assert((int)SituationMap::ElevationMapManager::LineOfSight::LOS_UNDEFINED ==
                   (int)LtsElevation::LineOfSight::LOS_UNDEFINED,
@@ -72,8 +78,8 @@ class LtsElevationManager::Private
 
 LtsElevationManager::LtsElevationManager()
     : QObject(nullptr)
-    , m_logger(getLogger("LtsElevationManager"))
     , d(new Private)
+    , m_logger(getLogger("LtsElevationManager"))
 {
     ++s_counter;
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this;
@@ -106,15 +112,71 @@ LtsElevationManager::createInstance(int exerciseId, const std::shared_ptr<Exerci
         return nullptr;
     }
 
-    QStringList filePaths_rough_to_fine;
+    // Qt5 logic restored (the qt6 port had dropped the exerciseId->trainingAreaId
+    // caching and always returned nullptr here).
 #ifdef BUILD_RTI
-    filePaths_rough_to_fine = getFilenamesForExercise(exerciseId);
+    int trainingAreaId = -1;
+
+    // remember for future calls
+    // (so createInstance should work WITHOUT dtcs)
+    // Idea: MainHandler: createInstance with exerciseId and valid dtcs
+    // Plugin or simular: createInstance with exerciseId and no dtcs
+    static QHash<int, int> s_exIdToTaIdStore;
+
+    const auto exTaIt = s_exIdToTaIdStore.find(exerciseId);
+    if (exTaIt != s_exIdToTaIdStore.end())
+    {
+        // CASE 1:
+        // already created:
+        trainingAreaId = *exTaIt;
+    }
+    else
+    {
+        // CASE 2:
+        // ... or create on demand:
+        if (!exmDtc || !asmDtc)
+        {
+            ERROR_LOG(logger) << Q_FUNC_INFO << " no dtcs for exerciseId=" << exerciseId
+                              << ", asmDtc=" << asmDtc
+                              << ", exmDtc=" << exmDtc;
+            return nullptr;
+        }
+
+        // exId to taId
+        trainingAreaId = exerciseIdToTrainingAreaId(exerciseId, exmDtc);
+        if (trainingAreaId <= 0)
+        {
+            ERROR_LOG(logger) << Q_FUNC_INFO << " Error getting trainingAreaId"
+                              << ", exerciseId=" << exerciseId
+                              << ", trainingAreaId=" << trainingAreaId;
+            return nullptr;
+        }
+
+        // store and remember:
+        s_exIdToTaIdStore[exerciseId] = trainingAreaId;
+    }
+
+    // CASE 1: Following should work even with invalid asmDtc:
+    LTS_ELEVATION_MANAGER_TYPE temp = createInstanceForTrainingAreaId(trainingAreaId, asmDtc);
+    if (!temp)
+    {
+        ERROR_LOG(logger) << Q_FUNC_INFO << " Error on createInstanceForTrainingAreaId"
+                          << ", exerciseId=" << exerciseId
+                          << ", trainingAreaId=" << trainingAreaId;
+        return nullptr;
+    }
+
+    // add exmDtc
+    temp->initDDS(exmDtc, asmDtc);
+
+    TRACE_LOG(logger) << Q_FUNC_INFO << " END, exerciseId=" << exerciseId;
+    return temp;
 #else
-    Q_UNUSED(exerciseId);
-    ERROR_LOG(logger) << Q_FUNC_INFO << " BUILD_RTI=OFF, cannot get filenames for exercise";
-#endif
-    Q_UNUSED(filePaths_rough_to_fine);
+    Q_UNUSED(exmDtc);
+    Q_UNUSED(asmDtc);
+    ERROR_LOG(logger) << Q_FUNC_INFO << " BUILD_RTI=OFF, cannot create instance";
     return nullptr;
+#endif
 }
 
 LTS_ELEVATION_MANAGER_TYPE LtsElevationManager::getInstance(int exerciseId)
@@ -291,19 +353,19 @@ QStringList LtsElevationManager::getFilenamesForTrainingArea(int trainingAreaId)
     {
         d->m_asmDtc->waitForHistoricalDataTrainingArea(1000);
         const AssetManagement::TrainingArea& ta = d->m_asmDtc->trainingArea(trainingAreaId);
-        if (ta.id() != trainingAreaId)
+        if (ta.id != trainingAreaId)
         {
             ERROR_LOG(m_logger) << Q_FUNC_INFO << " Error on s_asmDtc->trainingArea"
                                 << ", trainingAreaId=" << trainingAreaId;
             return {};
         }
-        const std::vector<AssetManagement::MapDescription>& mdVec = ta.elevation();
+        const std::vector<AssetManagement::MapDescription>& mdVec = ta.elevation;
         filePaths_rough_to_fine.reserve(mdVec.size());
 
         for (const AssetManagement::MapDescription& md : std::as_const(mdVec))
         {
 
-            QUrl url(QString::fromStdString(md.url()));
+            QUrl url(QString::fromStdString(md.url));
             QString filePathAbs = url.toLocalFile();
             if (QDir::isRelativePath(filePathAbs))
                 filePathAbs = SituationMap::getResourcePath() + QStringLiteral("/elevation/") + filePathAbs;
@@ -372,13 +434,13 @@ int LtsElevationManager::exerciseIdToTrainingAreaId(int exerciseId,
         exmDtc->waitForHistoricalDataExercise(1000);
 
         const ExerciseManagement::Exercise& exm = exmDtc->exercise(exerciseId);
-        if (exm.id() != exerciseId)
+        if (exm.id != exerciseId)
         {
             ERROR_LOG(logger) << Q_FUNC_INFO << " Error on m_exmDtc->exercise"
                               << ", exerciseId=" << exerciseId;
             return -1;
         }
-        trainingAreaId = exm.trainingAreaId();
+        trainingAreaId = exm.trainingAreaId;
 
         if (trainingAreaId <= 0)
         {

qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/lts_licence.cpp

@@ -20,15 +20,13 @@ QVector<Licence> readLicences(const QByteArray& unencryptedXmlData)
     QVector<Licence> licenceVec;
 
     QDomDocument xmlDoc;
-    QString errorMsg;
-    int errorLine = 0;
-    int errorColumn = 0;
 
-    if (!xmlDoc.setContent(unencryptedXmlData, &errorMsg, &errorLine, &errorColumn))
+    const auto parseResult = xmlDoc.setContent(unencryptedXmlData);
+    if (!parseResult)
     {
         ERROR_LOG(getLogger()) << "Error reading xml data, "
-                               << "error in line " << errorLine << ", column " << errorColumn
-                               << ", message: " << errorMsg;
+                               << "error in line " << int(parseResult.errorLine) << ", column " << int(parseResult.errorColumn)
+                               << ", message: " << parseResult.errorMessage;
         return licenceVec;
     }
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/logout_info_dialog.cpp

@@ -16,7 +16,7 @@ LogoutInformationDialog::LogoutInformationDialog(int timeOut, AssetManagement::S
 {
     m_ui->setupUi(this);
     QString actionText;
-    switch (shutdownAction.underlying())
+    switch (shutdownAction)
     {
         case AssetManagement::ShutdownAction::NoAction:
         case AssetManagement::ShutdownAction::Logout:

qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.cpp

@@ -154,13 +154,13 @@ void LtsLogin::slotLogoutShutdown(const AssetManagement::WorkstationLogout& data
 
     if (!m_asmDtc->isAssetEnabled())
         m_asmDtc->enableAsset();
-    for (int id : data.ids())
+    for (int id : data.ids)
     {
-        if (QString::fromStdString(m_asmDtc->asset(id).name())
+        if (QString::fromStdString(m_asmDtc->asset(id).name)
                 .compare(LtsSession::LtsSession::workstationName(), Qt::CaseInsensitive) == 0)
         {
             m_isInLogoutDialog = true;
-            showLogoutInformationDialog(data.shutdownAction());
+            showLogoutInformationDialog(data.shutdownAction);
             break;
         }
     }
@@ -250,24 +250,24 @@ void LtsLogin::logoff()
     m_loginApp = nullptr;
 
     QString cmd;
-    switch (m_shutdownAction.underlying())
+    switch (m_shutdownAction)
     {
-        case AssetManagement::ShutdownAction_def::Shutdown:
+        case AssetManagement::ShutdownAction::Shutdown:
 #ifdef LTS_DEBUG
             cmd = QStringLiteral("xeyes");
 #else
             cmd = QStringLiteral("systemctl poweroff");
 #endif
             break;
-        case AssetManagement::ShutdownAction_def::Reboot:
+        case AssetManagement::ShutdownAction::Reboot:
 #ifdef LTS_DEBUG
             cmd = QStringLiteral("kcalc");
 #else
             cmd = QStringLiteral("systemctl reboot");
 #endif
             break;
-        case AssetManagement::ShutdownAction_def::Logout:
-        case AssetManagement::ShutdownAction_def::NoAction:
+        case AssetManagement::ShutdownAction::Logout:
+        case AssetManagement::ShutdownAction::NoAction:
             emit signalLogoffDone();
             break;
     }

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

@@ -9,6 +9,8 @@
  */
 
 #include "lts_plugin_loader.h"
+#include <memory>
+#include <utility>
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsAppDescriptor/lts_app_descriptor.h>
@@ -56,7 +58,7 @@ LtsPluginLoader::~LtsPluginLoader()
 
 void LtsPluginLoader::unloadAllPlugins()
 {
-  for (auto &pi : qAsConst(m_loadedPlugins))
+  for (auto &pi : std::as_const(m_loadedPlugins))
   {
     QPluginLoader *pluginLoader = pi.pluginLoader;
 
@@ -280,7 +282,7 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType,
     //      continue;
     //    }
 
-    QScopedPointer<QPluginLoader> pluginLoader(new QPluginLoader);
+    std::unique_ptr<QPluginLoader> pluginLoader(new QPluginLoader);
     pluginLoader->setFileName(absoluteFilePath);
 
     const QJsonObject jObj = pluginLoader->metaData();
@@ -293,7 +295,8 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType,
     }
 
     const QString jsonIid = iid.value().toString().toLower(); // LOWERCASE ! (pun intended)
-    const QVector<QStringRef> iidParameters = jsonIid.splitRef(QLatin1Char(':'));
+    // Use QStringView for efficient string operations
+    const QList<QStringView> iidParameters = QStringView{jsonIid}.split(QLatin1Char(':'));
 
     DEBUG_LOG(logger) << "Plugin " << absoluteFilePath << " provides iid '" << jsonIid;
 
@@ -431,7 +434,7 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType,
     pi.fileName = filename;
     pi.fullFileName = absoluteFilePath;
     pi.plugin = plugin;
-    pi.pluginLoader = pluginLoader.data();
+    pi.pluginLoader = pluginLoader.get();
 
     if (loadPlugin && !loadPlugin(pi)) // does the dev want this plugin? if no, unload it!   TODO: really unload? or still cache it??
     {
@@ -440,7 +443,7 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType,
       pluginLoader->unload();
       continue; // next plugin
     }
-    pi.pluginLoader = pluginLoader.take();
+    pi.pluginLoader = pluginLoader.release();
 
     // the dev decided to use that plugin, so cache it
     m_loadedPlugins.insert(PluginKey(requestedPluginType, pluginName), pi);

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

@@ -21,7 +21,7 @@ namespace LtsPluginManager
 
 LtsPluginManager::LtsPluginManager()
   : m_sessionManager(new LtsSession::LtsSessionManager)
-  .getNGLLogger("LtsPluginManager"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("LtsPluginManager"))
   , m_markedForDeletion(false)
 {
     connect(m_sessionManager, &LtsSession::LtsSessionManager::signalQuit, this, &LtsPluginManager::signalQuit);

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/LtsScriptTimeline/track_drag_handler.cpp

@@ -58,7 +58,7 @@ void DragHandler::dragLeaveEvent(QDragLeaveEvent* event)
 
 void DragHandler::dropEvent(QDropEvent* event)
 {
-    int dropPos = event->pos().x();
+    int dropPos = event->position().toPoint().x();
     int dropTime = m_tcw->m_tools->getTime(dropPos, m_tcw->m_isFilter) - m_tcw->m_dragOffsetTime;
 
     for (const auto& tcw : std::as_const(m_tcwCorresponding))
@@ -80,7 +80,7 @@ void DragHandler::dropEvent(QDropEvent* event)
 
 void DragHandler::dragMoveEvent(QDragMoveEvent* event)
 {
-    int pos = event->pos().x();
+    int pos = event->position().toPoint().x();
 
     if (m_tcw->dragMove(pos))
         event->acceptProposedAction();
@@ -101,7 +101,7 @@ void DragHandler::mouseMoveEvent(QMouseEvent* event)
     if (event->buttons() != Qt::LeftButton)
         return;
 
-    QPoint cursorPos = m_tcw->mapFromGlobal(event->globalPos());
+    QPoint cursorPos = m_tcw->mapFromGlobal(event->globalPosition().toPoint());
 
     if (!m_tcw->m_mainSelected || ((cursorPos - m_dragStartPos).manhattanLength() < QApplication::startDragDistance() &&
                                    (m_dragStartPos - cursorPos).manhattanLength() < QApplication::startDragDistance()))

qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_header.cpp

@@ -37,7 +37,7 @@ void TrackHeader::mousePressEvent(QMouseEvent* event)
         return;
     if (!m_indicatorLock)
     {
-        setIndicatorTime(m_tools->getTime(event->localPos().x()));
+        setIndicatorTime(m_tools->getTime(event->position().toPoint().x()));
         emit signalHeaderIndicatorTimeUserChanged(m_indicatorTime);
     }
 }

qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_resize_handler.cpp

@@ -19,7 +19,7 @@ void ResizeHandler::mousePressEvent(QMouseEvent* event)
     if (event->buttons() != Qt::LeftButton || !m_possible)
         return;
 
-    TrackEntry* te = m_trackContentWidget->getTrackEntryOnPos(event->globalPos());
+    TrackEntry* te = m_trackContentWidget->getTrackEntryOnPos(event->globalPosition().toPoint());
 
     if (te == nullptr)
         return;
@@ -101,7 +101,7 @@ bool ResizeHandler::isCollision(int newLength) const
 
 bool ResizeHandler::mouseMoveEvent(QMouseEvent* event)
 {
-    QPoint pos = m_trackContentWidget->mapFromGlobal(event->globalPos());
+    QPoint pos = m_trackContentWidget->mapFromGlobal(event->globalPosition().toPoint());
     int posX = pos.x();
     int cursorTime = m_trackContentWidget->m_tools->getTime(posX, m_trackContentWidget->m_isFilter);
 
@@ -128,7 +128,7 @@ bool ResizeHandler::mouseMoveEvent(QMouseEvent* event)
     }
     else
     {
-        TrackEntry* te = m_trackContentWidget->getTrackEntryOnPos(event->globalPos());
+        TrackEntry* te = m_trackContentWidget->getTrackEntryOnPos(event->globalPosition().toPoint());
 
         if (m_trackContentWidget->m_isFilter)
         {

qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_select_handler.cpp

@@ -45,7 +45,7 @@ void SelectHandler::mousePressEvent(QMouseEvent* event)
     {
         m_pressedEntry = nullptr;
 
-        QPoint clickedPos = tcw->mapFromGlobal(event->globalPos());
+        QPoint clickedPos = tcw->mapFromGlobal(event->globalPosition().toPoint());
         int clickedPosY = clickedPos.y();
         int clickedPosX = clickedPos.x();
 
@@ -133,13 +133,13 @@ void SelectHandler::mousePressEvent(QMouseEvent* event)
             contextMenu->addAction(action);
         }
 
-        contextMenu->popup(event->globalPos());
+        contextMenu->popup(event->globalPosition().toPoint());
     }
 }
 
 void SelectHandler::mouseReleaseEvent(QMouseEvent* event)
 {
-    QPoint clickedPos = tcw->mapFromGlobal(event->globalPos());
+    QPoint clickedPos = tcw->mapFromGlobal(event->globalPosition().toPoint());
     int clickedPosX = clickedPos.x();
     int clickedTime = tcw->m_tools->getTime(clickedPosX, tcw->m_isFilter);
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_widget.cpp

@@ -54,7 +54,7 @@ TrackWidget::TrackWidget(int baseWidth, bool readonly, Tools* tools, bool filter
     connect(ui->mainTrack, &TrackContentWidget::signalTrackEntryDeleted, this, &TrackWidget::slotTrackEntryDeleted);
     connect(ui->mainTrack, &TrackContentWidget::signalEditEntry, this, &TrackWidget::signalEditEntry);
 
-    connect(ui->chkSelect, &QCheckBox::stateChanged, this, &TrackWidget::signalSelectTrack);
+    connect(ui->chkSelect, &QCheckBox::checkStateChanged, this, &TrackWidget::signalSelectTrack);
     connect(ui->pbExpand, &QPushButton::clicked, this, &TrackWidget::slotExpand);
     connect(ui->pbAddFilter, &QPushButton::clicked, this, &TrackWidget::slotAddFilter);
 }

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

@@ -32,8 +32,10 @@ NGL_TARGET_LINK_LIBRARIES(LtsSessionDataDds
   PRIVATE
     $<$<BOOL:${BUILD_RTI}>:$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>>
   PUBLIC
-    $<$<BOOL:${BUILD_RTI}>:nddscore>
+    $<$<BOOL:${BUILD_RTI}>:RTI::nddscore>
     $<$<BOOL:${BUILD_RTI}>:ddsQoS>
+    # Generated Core type support (topic_type_support<Core::PartitionTime>, ...)
+    $<$<BOOL:${BUILD_RTI}>:$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>>
     NGLLogger
     Qt6::Core
 )
@@ -46,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}
@@ -77,7 +81,14 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsSession
 )
 
 # Optional external dependencies
-FIND_LIBRARY(SVCCORECLIENT_LIBRARY NAMES svcCoreClient PATHS /usr/local/lib /usr/lib NO_DEFAULT_PATH)
+# Prefer the in-tree target: a fresh build tree does not have svcCoreClient
+# installed in /usr/local/lib, and the Core::Interface::Ftc::create symbols
+# referenced at link time live in libsvcCoreClient.so
+IF(TARGET svcCoreClient)
+  SET(SVCCORECLIENT_LIBRARY svcCoreClient)
+ELSE()
+  FIND_LIBRARY(SVCCORECLIENT_LIBRARY NAMES svcCoreClient PATHS /usr/local/lib /usr/lib NO_DEFAULT_PATH)
+ENDIF()
 FIND_LIBRARY(OHPONLINEHELP_LIBRARY NAMES OhpOnlineHelpViewerGuiPluginInterface PATHS /usr/local/lib /usr/lib NO_DEFAULT_PATH)
 
 SET(LtsSession_PRIVATE_LIBS
@@ -112,7 +123,7 @@ IF(BUILD_RTI)
     PRIVATE
       ddsconnector
     PUBLIC
-      nddscore
+      RTI::nddscore
   )
   TARGET_COMPILE_DEFINITIONS(LtsSession PUBLIC BUILD_RTI)
 ENDIF()

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

@@ -9,6 +9,7 @@
  */
 
 #include "lts_session.h"
+#include <utility>
 
 #ifdef BUILD_RTI
 #include "lts_session_data_dds.h"
@@ -40,7 +41,9 @@
 #include <LtsWidgets/lts_tab_widget.h>
 #include <PluginInterfaces/data_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#ifdef BUILD_FILTERMANAGEMENT
+// Complete type needed for dynamic_pointer_cast of m_ohvIfc (BUILD_RTI code below);
+// the header is self-contained (Qt only), the FilterManagement plugin is only the implementor.
+#ifdef BUILD_RTI
 #include <Lts/Plugins/OnlineHelp/ohp_online_help_viewer_gui_plugin_interface.h> // XXX: grrr..
 #endif
 #include <QtWidgets/QApplication>
@@ -156,7 +159,7 @@ QString LtsSession::toString() const
     str.append(QStringLiteral(", workspaceId='%1'").arg(workspaceId()));
 #ifdef BUILD_RTI
     str.append(QStringLiteral(", appToString='%1'").arg(appToString(app())));
-    str.append(QStringLiteral(", partitionType=%1, exerciseId='%2'").arg(partitionType()).arg(exerciseId()));
+    str.append(QStringLiteral(", partitionType=%1, exerciseId='%2'").arg(static_cast<int>(partitionType())).arg(exerciseId()));
     str.append(QStringLiteral(", LtsSessionDataDds=%1").arg(LtsSessionDataDds::toString()));
 #else
     str.append(QStringLiteral(", app=Login (stub)"));
@@ -913,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(); ?!?
@@ -1305,7 +1313,7 @@ void LtsSession::createBaseLayout()
     if (showDeveloperActions)
         addDeveloperActions();
 
-    for (LtsNotification::LtsNotificationController* ctl : qAsConst(m_notiCtlList))
+    for (LtsNotification::LtsNotificationController* ctl : std::as_const(m_notiCtlList))
     {
         if (!m_baseLayout->notificationExists(ctl->identifier())) // add if non-existent only
             m_baseLayout->addNotification(ctl->createWidget());   // FIXME: crash when no icons?

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

@@ -20,30 +20,6 @@
 #include <QtCore/QSet>
 #include <QtCore/QVector>
 
-namespace
-{
-// Convert LtsSession::PartitionType to IDL::PartitionType
-IDL::PartitionType toIdlPartitionType(LtsSession::PartitionType type)
-{
-    switch (type)
-    {
-        case LtsSession::PartitionType::Any:
-            return IDL::PartitionType::Any;
-        case LtsSession::PartitionType::Global:
-            return IDL::PartitionType::Global;
-        case LtsSession::PartitionType::Exercise:
-            return IDL::PartitionType::Exercise;
-        case LtsSession::PartitionType::AllExercises:
-            return IDL::PartitionType::AllExercises;
-        case LtsSession::PartitionType::Replay:
-            return IDL::PartitionType::Replay;
-        case LtsSession::PartitionType::Invalid:
-        default:
-            return IDL::PartitionType::Any;
-    }
-}
-} // namespace
-
 namespace LtsSession
 {
 /**
@@ -74,7 +50,7 @@ class DdsConnectionContainer
         for (int i = ddsConnections.size() - 1; i >= 0; --i)
         {
             const DdsConnection& conn = ddsConnections.at(i);
-            if (toIdlPartitionType(conn.partitionType) != IDL::PartitionType::Global)
+            if (conn.partitionType != IDL::PartitionType::Global)
                 continue;
             auto ret = conn.ddsConnector.lock();
             if (ret != nullptr)
@@ -242,7 +218,7 @@ bool LtsSessionDataDds::init(const DdsConnectionParams& connParams)
 #endif
 
         m_ddsConnector = std::make_shared<DDSConnector::DdsConnector>(
-            connParams.domainId, toIdlPartitionType(connParams.partitionType), connParams.partitionId,
+            connParams.domainId, connParams.partitionType, connParams.partitionId,
             connParams.exerciseId, // same as partition Id in live but not in replay
             type);
         s_ddsConnections()->insertConnection(connParams, m_ddsConnector);
@@ -277,7 +253,7 @@ bool LtsSessionDataDds::init(const dds::domain::DomainParticipant& dp, const Dds
         if (m_ddsConnector == nullptr)
         {
             m_ddsConnector =
-                std::make_shared<DDSConnector::DdsConnector>(dp, toIdlPartitionType(connParams.partitionType), type, connParams.partitionId);
+                std::make_shared<DDSConnector::DdsConnector>(dp, connParams.partitionType, type, connParams.partitionId);
 
             s_ddsConnections()->insertConnection(connParams, m_ddsConnector);
         }
@@ -292,38 +268,27 @@ Fetcher* LtsSessionDataDds::fetcher(const QString& yourPluginsName)
     return m_fetcher;
 }
 
-QString LtsSessionDataDds::partitionTypeString(PartitionType partitionType)
+QString LtsSessionDataDds::partitionTypeString(IDL::PartitionType partitionType)
 {
     switch (partitionType)
     {
-        case PartitionType::AllExercises:
+        case IDL::PartitionType::AllExercises:
             return QStringLiteral("AllExercises");
-        case PartitionType::Any:
+        case IDL::PartitionType::Any:
             return QStringLiteral("Any");
-        case PartitionType::Exercise:
+        case IDL::PartitionType::Exercise:
             return QStringLiteral("Exercise");
-        case PartitionType::Global:
+        case IDL::PartitionType::Global:
             return QStringLiteral("Global");
-        case PartitionType::Replay:
+        case IDL::PartitionType::Replay:
             return QStringLiteral("Replay");
+        default:
+            break;
     }
 
     return QStringLiteral("Invalid (%1)").arg(int(partitionType));
 }
 
-LtsSession::PartitionType LtsSessionDataDds::toPartitionType(IDL::PartitionType idlType)
-{
-    switch (idlType)
-    {
-        case IDL::PartitionType::Any: return PartitionType::Any;
-        case IDL::PartitionType::Exercise: return PartitionType::Exercise;
-        case IDL::PartitionType::Replay: return PartitionType::Replay;
-        case IDL::PartitionType::AllExercises: return PartitionType::AllExercises;
-        case IDL::PartitionType::Global: return PartitionType::Global;
-        default: return PartitionType::Invalid;
-    }
-}
-
 QString LtsSessionDataDds::toString() const
 {
     return QStringLiteral("(LtsSessionDataDds: id=%1, partitionId=%2, partitionType=%3(%4), exerciseId=%5)")
@@ -349,9 +314,9 @@ int LtsSessionDataDds::partitionId() const
     return m_ddsConnector ? m_ddsConnector->getPartitionId() : -1;
 }
 
-PartitionType LtsSessionDataDds::partitionType() const
+IDL::PartitionType LtsSessionDataDds::partitionType() const
 {
-    return m_ddsConnector ? toPartitionType(m_ddsConnector->getPartitionType()) : PartitionType::Global;
+    return m_ddsConnector ? m_ddsConnector->getPartitionType() : IDL::PartitionType::Global;
 }
 
 QStringList LtsSessionDataDds::qosFile() const
@@ -394,7 +359,7 @@ bool LtsSessionDataDds::initInternal()
     assert(m_dtcPartitionTime.get());
 
     m_dtcPartitionTime->setSubscriberCallback([this](const Core::PartitionTime& data, DataModification) {
-        m_curMSecSinceEpoch = data.timeStamp();
+        m_curMSecSinceEpoch = data.timeStamp;
         emit partitionTimeChangedInternal();
     });
     connect(this, &LtsSessionDataDds::partitionTimeChangedInternal, this,

qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.h

@@ -38,12 +38,12 @@ struct DdsConnectionParams
 
   DdsConnectionParams() = default;
   explicit DdsConnectionParams(const Core::ReplayPartition &rp)
-    : domainId(rp.domainId())
-    , partitionId(rp.id())
-    , exerciseId(rp.exerciseId())
+    : domainId(rp.domainId)
+    , partitionId(rp.id)
+    , exerciseId(rp.exerciseId)
     , partitionType(IDL::PartitionType::Replay)
   {
-    setTcpConnectionUrl(rp.tcpConnectionUrl());
+    setTcpConnectionUrl(rp.tcpConnectionUrl);
   }
 
   bool isValid() const { return domainId >= 0 && partitionType != IDL::PartitionType::Any; }

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

@@ -1,11 +1,96 @@
 #include "lts_session_lock_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QDebug>
 
 namespace LtsSession
 {
 
-// STUB implementations - RTI DDS not available
-// All methods are stubbed since RTI Connext DDS is not available
+// STUB implementations - RTI Connext DDS not available.
+// The topic-lock feature depends on the RTI DDS backend (Core::Interface::Ftc),
+// which is an optional dependency not present in this build. These definitions
+// exist so that LtsSession links; the moc-generated qt_metacall references every
+// slot, so each slot needs a body. Semantics reflect an unavailable backend:
+// init reports failure (the caller logs a warning and skips wiring the handler)
+// and the handler is never locked.
+
+TopicLockHandler::TopicLockHandler()
+  : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("LtsSession.TopicLockHandler"))
+{
+}
+
+TopicLockHandler::~TopicLockHandler() {}
+
+bool TopicLockHandler::init(const std::shared_ptr<Core::Interface::Ftc> &coreFtc, int exerciseId)
+{
+  Q_UNUSED(coreFtc);
+  Q_UNUSED(exerciseId);
+  return false; // RTI DDS backend unavailable
+}
+
+void TopicLockHandler::slotTryLock(const LtsWidgets::TopicInfo &topicInfo)
+{
+  Q_UNUSED(topicInfo);
+}
+
+bool TopicLockHandler::slotUnlock()
+{
+  return true; // nothing is locked (no DDS backend)
+}
+
+void TopicLockHandler::slotFinalize() {}
+
+bool TopicLockHandler::lock()
+{
+  return false; // no DDS backend to lock against
+}
+
+bool TopicLockHandler::unlock()
+{
+  return true; // nothing to unlock
+}
+
+std::string TopicLockHandler::objStateAsString() const
+{
+  return "stub (RTI DDS not available)";
+}
+
+
+TopicLockHanderData::TopicLockHanderData() {}
+
+TopicLockHanderData::~TopicLockHanderData() {}
+
+void TopicLockHanderData::init(const std::shared_ptr<Core::Interface::Ftc> &coreFtc, int exerciseId)
+{
+  Q_UNUSED(coreFtc);
+  Q_UNUSED(exerciseId);
+}
+
+void TopicLockHanderData::unlock() {}
+
+void TopicLockHanderData::slotTryLock(const LtsWidgets::TopicInfo &topicInfo)
+{
+  Q_UNUSED(topicInfo);
+}
+
+bool TopicLockHanderData::isLocked() const
+{
+  return false; // no DDS backend: never locked
+}
+
+LtsWidgets::TopicInfo TopicLockHanderData::getTopicInfo() const
+{
+  return LtsWidgets::TopicInfo();
+}
+
+void TopicLockHanderData::slotLock(const QString &lockedBy)
+{
+  m_lockedBy = lockedBy;
+}
+
+void TopicLockHanderData::slotUnlock()
+{
+  m_lockedBy.clear();
+}
 
 } // namespace LtsSession

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/main.cpp

@@ -89,7 +89,6 @@ void populateModel(LtsTimeline::TimelineModel* model)
 
     try
     {
-        const TestItem& testItem = dynamic_cast<const TestItem&>(model->item(5));
     }
     catch (const std::exception& ex)
     {
@@ -109,6 +108,7 @@ void populateModel(LtsTimeline::TimelineModel* model)
 #define unsorted false
         QVector<int> x;
         bool y;
+        (void)y;
 
         x = model->itemIdsBetween(now + 60'000 + 1, now + 150'000 - 1, non_strict, recursive);
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_model.cpp

@@ -51,7 +51,10 @@ Track& TimelineModel::track(int id) noexcept(false)
     {
         if (id == m_rootTrack.id())
             return m_rootTrack;
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // model facade delegates to the deprecated root Track lookup
         return m_rootTrack.track(id);
+        #pragma GCC diagnostic pop
     }
 
     auto it = m_trackCache.find(id);
@@ -68,7 +71,10 @@ const Track& TimelineModel::track(int id) const noexcept(false)
     {
         if (id == m_rootTrack.id())
             return m_rootTrack;
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // model facade delegates to the deprecated root Track lookup
         return m_rootTrack.track(id);
+        #pragma GCC diagnostic pop
     }
 
     std::map<int, Track*>::const_iterator it = m_trackCache.find(id);
@@ -82,7 +88,10 @@ const Track& TimelineModel::track(int id) const noexcept(false)
 Item& TimelineModel::item(int id) noexcept(false)
 {
     if (!m_itemCaching)
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // model facade delegates to the deprecated root Track lookup
         return m_rootTrack.item(id);
+        #pragma GCC diagnostic pop
 
     auto it = m_itemCache.find(id);
 
@@ -95,7 +104,10 @@ Item& TimelineModel::item(int id) noexcept(false)
 const Item& TimelineModel::item(int id) const noexcept(false)
 {
     if (!m_itemCaching)
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // model facade delegates to the deprecated root Track lookup
         return m_rootTrack.item(id);
+        #pragma GCC diagnostic pop
 
     decltype(m_itemCache)::const_iterator it = m_itemCache.find(id);
 
@@ -132,7 +144,10 @@ bool TimelineModel::isItemsBetween(qint64 start, qint64 end, const QVector<int>&
 const QVector<int> TimelineModel::copyItemIdsBetween(qint64 start, qint64 end, bool strict, bool complete,
                                                      bool sorted) const
 {
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // model facade delegates to the deprecated root Track lookup
     return m_rootTrack.copyItemIdsBetween(start, end, strict, complete, true, sorted);
+    #pragma GCC diagnostic pop
 }
 
 bool TimelineModel::isItemsBetween(qint64 start, qint64 end, int ignoreId, bool strict, bool complete,

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_view_drag_handler.cpp

@@ -45,9 +45,9 @@ void TimelineViewDragHandler::dragMoveEvent(QDragMoveEvent* e)
     if (!e->mimeData()->hasFormat(Item::mimetype))
         return;
 
-    m_dragPos = e->pos();
+    m_dragPos = e->position().toPoint();
     m_view->m_header->setHoverPosition(m_dragPos.x());
-    e->setAccepted(canDragItemsTo(e->pos()));
+    e->setAccepted(canDragItemsTo(e->position().toPoint()));
     m_view->viewport()->update();
 }
 
@@ -67,7 +67,7 @@ void TimelineViewDragHandler::dropEvent(QDropEvent* e)
     if (!e->mimeData()->hasFormat(Item::mimetype))
         return;
 
-    if (!canDragItemsTo(e->pos()))
+    if (!canDragItemsTo(e->position().toPoint()))
     {
         clear();
         e->acceptProposedAction();

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/timeline_widget.cpp

@@ -22,8 +22,8 @@ namespace LtsTimeline
 
 TimelineWidget::TimelineWidget(QWidget *parent) 
   : QWidget(parent)
-  , m_ui(new Ui::Timeline)
   , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Timeline.TimelineWidget"))
+  , m_ui(new Ui::Timeline)
 {
     m_ui->setupUi(this);
     m_ui->debugWidget->hide();

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/track.cpp

@@ -20,7 +20,10 @@ const Track& Track::track(int id) const noexcept(false)
     {
         try
         {
+            #pragma GCC diagnostic push
+            #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // self-recursive lookup: recurses via the deprecated public Track API
             return track->track(id);
+            #pragma GCC diagnostic pop
         }
         catch (...)
         {
@@ -131,6 +134,7 @@ void Track::removeCopyItem(int itemId) noexcept(false)
 const QVector<int> Track::copyItemIdsBetween(qint64 start, qint64 end, bool strict, bool complete, bool recursive,
                                              bool sorted, qint64 minimumDuration) const
 {
+    Q_UNUSED(minimumDuration);
     auto itemPtrRefs = _copyItems();
 
     if (recursive)
@@ -153,7 +157,10 @@ const QVector<int> Track::copyItemIdsBetween(qint64 start, qint64 end, bool stri
         sort(itemPtrRefs);
     }
 
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // internal call to the deprecated transformItemPtrsToIds helper
     return transformItemPtrsToIds(itemPtrRefs);
+    #pragma GCC diagnostic pop
 }
 
 const QVector<int> Track::itemIdsBetween(qint64 start, qint64 end, bool strict, bool complete, bool recursive,
@@ -171,7 +178,10 @@ const QVector<int> Track::itemIdsBetween(qint64 start, qint64 end, bool strict,
 
         sort(itemPtrRefs);
 
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // internal call to the deprecated transformItemPtrsToIds helper
         return transformItemPtrsToIds(itemPtrRefs);
+        #pragma GCC diagnostic pop
     }
 
     QVector<int> itemIds;
@@ -209,7 +219,10 @@ bool Track::isItemsBetween(qint64 start, qint64 end, const QVector<int>& ignoreI
 
     for (const int itemId : std::as_const(m_copyItemIds))
     {
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // internal lookup via the deprecated Track::item
         const Item& i = item(itemId);
+        #pragma GCC diagnostic pop
         if (!ignoreIds.contains(i.id()))
             if (isItemBetween(i, start, end, strict, complete, minimumDuration))
                 return true;
@@ -304,7 +317,10 @@ ItemPtrNCVRefs Track::_itemsNCV(bool recursive)
 
 const QVector<int> Track::_itemIds(bool recursive) const
 {
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // internal call to the deprecated transformItemPtrsToIds helper
     QVector<int> itemIds(transformItemPtrsToIds(m_items));
+    #pragma GCC diagnostic pop
 
     if (!recursive)
         return itemIds;
@@ -363,19 +379,28 @@ QVector<int> Track::itemIds(bool recursive, bool sorted) const
     if (sorted)
     {
         if (!recursive)
+            #pragma GCC diagnostic push
+            #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // internal call to the deprecated transformItemPtrsToIds helper
             return transformItemPtrsToIds(m_items);
+            #pragma GCC diagnostic pop
 
         ItemPtrRefs is(_items(true));
 
         sort(is);
 
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // internal call to the deprecated transformItemPtrsToIds helper
         return transformItemPtrsToIds(is);
+        #pragma GCC diagnostic pop
     }
 
     QVector<int> itemIds;
     itemIds.reserve(m_items.size());
 
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // internal call to the deprecated transformItemPtrsToIds helper
     itemIds += transformItemPtrsToIds(m_items);
+    #pragma GCC diagnostic pop
 
     if (!recursive)
         return itemIds;
@@ -448,7 +473,10 @@ Track& Track::track(int id) noexcept(false)
     {
         try
         {
+            #pragma GCC diagnostic push
+            #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // self-recursive lookup: recurses via the deprecated public Track API
             return track->track(id);
+            #pragma GCC diagnostic pop
         }
         catch (...)
         {
@@ -495,7 +523,10 @@ Item& Track::item(int id) noexcept(false)
     {
         try
         {
+            #pragma GCC diagnostic push
+            #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // self-recursive lookup: recurses via the deprecated public Track API
             return track->item(id);
+            #pragma GCC diagnostic pop
         }
         catch (...)
         {
@@ -519,7 +550,10 @@ const Item& Track::item(int id) const noexcept(false)
     {
         try
         {
+            #pragma GCC diagnostic push
+            #pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // self-recursive lookup: recurses via the deprecated public Track API
             return track->item(id);
+            #pragma GCC diagnostic pop
         }
         catch (...)
         {

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/LtsTimelineClassic/main.cpp

@@ -20,7 +20,7 @@ void add(qint64 time_offset)
     time += time_offset;
 
     ttm->addTestEvent(new LtsTimelineClassic::Event(
-        0, (int)ProjectDataManagement::PdmEventType_def::Hit, time, 0, 0, 0, 0, QStringList() << QStringLiteral("Test"),
+        0, (int)ProjectDataManagement::PdmEventType::EventType_Hit, time, 0, 0, 0, 0, QStringList() << QStringLiteral("Test"),
         LtsTimelineClassic::Event::drawCustomEventGraphicEllipse, QColor("green"), QString()));
 }
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/UnitTests/utils_test.cpp

@@ -935,8 +935,8 @@ void LtsUtilsTest::test_jsonArray()
 
     QVERIFY_EXCEPTION_THROWN(array.at<std::string>(0), JsonTypeError);
 
-    QVERIFY_EXCEPTION_THROWN(array.contains<int>(-1), JsonRangeError);
-    QVERIFY_EXCEPTION_THROWN(array.contains<int>(4), JsonRangeError);
+    QVERIFY_EXCEPTION_THROWN((void)array.contains<int>(-1), JsonRangeError);
+    QVERIFY_EXCEPTION_THROWN((void)array.contains<int>(4), JsonRangeError);
     QVERIFY_EXCEPTION_THROWN(array.at<int>(-1), JsonRangeError);
     QVERIFY_EXCEPTION_THROWN(array.at<int>(4), JsonRangeError);
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qbytearray_byteaccess.h

@@ -211,7 +211,7 @@ template <typename T> bool inline get2Byte(const QByteArray& data, T& out)
 template <typename T> void inline set1Byte(const T in, QByteArray& out)
 {
     static_assert(std::is_integral_v<T> || std::is_enum_v<T>, "Only integrals allowed for raw byte accessd");
-    unsigned char c = in;
+    unsigned char c = static_cast<unsigned char>(in);
     out += c;
 }
 
@@ -223,12 +223,10 @@ template <typename T> bool inline get1Byte(const QByteArray& baData, size_t& pos
     if (size_t(baData.size()) < pos + 1)
         return false;
 
-    const char* data = baData.data() + pos;
-
     if (std::numeric_limits<T>::is_signed)
-        out = (T)(data[0]);
+        out = (T)(baData.at(pos));
     else
-        out = (T)(data[0] & 0xFF);
+        out = (T)(baData.at(pos) & 0xFF);
 
     pos += 1;
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/variant_operators.h

@@ -9,7 +9,7 @@ namespace LtsUtils
 
 inline bool lessThan(const QVariant& var1, const QVariant& var2)
 {
-    if (var1.canConvert(QMetaType::QString) && var2.canConvert(QMetaType::QString))
+    if (var1.canConvert<QString>() && var2.canConvert<QString>())
     {
         QString str1(var1.toString());
         QString str2(var2.toString());
@@ -28,7 +28,7 @@ inline bool lessThan(const QVariant& var1, const QVariant& var2)
 
         return d1 < d2;
     }
-    else if (var1.canConvert(QMetaType::Double) && var2.canConvert(QMetaType::Double))
+    else if (var1.canConvert<double>() && var2.canConvert<double>())
         return var1.toDouble() < var2.toDouble();
 
     return false;

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/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.cpp

@@ -46,21 +46,15 @@ RequestHelper::RequestHelper(QObject* parent, bool quiet,
 }
 
 void RequestHelper::addRequest(const std::function<int64_t()>& requestFunction,
-                               const std::function<void(const FunctionReplyType& baseReply)>& baseReplyHandler)
+                               const std::function<void(const Core::FunctionReply& baseReply)>& baseReplyHandler)
 {
     m_requestFunctions.append(RequestFunctionContainer(requestFunction, baseReplyHandler));
 }
 
-bool RequestHelper::requestReply(const FunctionReplyType& baseReply)
+bool RequestHelper::requestReply(const Core::FunctionReply& baseReply)
 {
-#ifdef BUILD_RTI
-    // Bei BUILD_RTI=ON: baseReply ist Core::FunctionReply, cast von dds::core::Reference
-    // Die Implementation erwartet Core::FunctionReplyObject
-    const Core::FunctionReplyObject fro(baseReply.id(), baseReply.errorString(), baseReply.errorParams());
-#else
-    // Stub-Version: nur id und error string
-    const Core::FunctionReplyObject fro(baseReply.id(), baseReply.str().c_str());
-#endif
+    // rtiddsgen 7.7 generates plain public members (no getters/setters)
+    const Core::FunctionReplyObject fro(baseReply.id, baseReply.errorString, baseReply.errorParams);
     return _requestReply(fro, &baseReply);
 }
 
@@ -69,7 +63,7 @@ bool RequestHelper::requestReply(const Core::FunctionReplyObject& replyObject)
     return _requestReply(replyObject, nullptr);
 }
 
-bool RequestHelper::_requestReply(const Core::FunctionReplyObject& fro, const FunctionReplyType* baseReply)
+bool RequestHelper::_requestReply(const Core::FunctionReplyObject& fro, const Core::FunctionReply* baseReply)
 {
     m_errorString = fro.translated();
 
@@ -100,14 +94,8 @@ bool RequestHelper::_requestReply(const Core::FunctionReplyObject& fro, const Fu
         if (baseReply)
             m_singleRequestCustomFunctionReply(*baseReply);
         else
-#ifdef BUILD_RTI
             m_singleRequestCustomFunctionReply(
                 Core::FunctionReply(fro.id(), fro.str(), fro.args(), fro.additionalInfo()));
-#else
-            // Stub-Version: FunctionReply mit passendem Konstruktor
-            m_singleRequestCustomFunctionReply(
-                Core::FunctionReply(fro.id(), fro.str(), fro.args(), fro.additionalInfo()));
-#endif
     }
 
     if (fro.error())
@@ -195,7 +183,7 @@ void RequestHelper::slotNextRequest()
 
 void RequestHelper::startSingleBackgroundRequest(
     const std::function<int64_t()>& requestFunction,
-    const std::function<void(const FunctionReplyType&)>& baseReplyHandler)
+    const std::function<void(const Core::FunctionReply&)>& baseReplyHandler)
 {
     m_blockingCall = false;
     startSingleRequest(requestFunction, baseReplyHandler);

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

@@ -8,8 +8,15 @@
 # --- Library LtsWebSocketCommon --------------------------------------------------------------------------------
 #
 # Make ${Qt6_WebSockets} optional
-if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
-  set(Qt6_WebSockets ${Qt6_WebSockets})
+# Link the real WebSockets module whenever the websocket code path is
+# compiled: QT6_WEBSOCKETS_AVAILABLE (root CMakeLists) and the manual
+# Qt6::WebSockets import are set when the real module was found. The old
+# QT6_GUI_AVAILABLE condition never held in this environment (Qt6
+# discovery takes the minimal path) and the Qt6_WebSockets variable was
+# never defined, so the websocket code compiled without the module on
+# the link line.
+if(QT6_WEBSOCKETS_REAL_FOUND OR Qt6WebSockets_FOUND)
+  set(Qt6_WebSockets Qt6::WebSockets)
 else()
   set(Qt6_WebSockets "")
 endif()

qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/data_manager_base_dl.h

@@ -35,6 +35,7 @@ template <typename T> class DataManagerBaseDl
     }
 
   protected:
+    NGL::INGLLogger &m_logger;
     std::shared_ptr<T> m_dbInterface;
 };
 } // namespace LtsWebSocket

qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_client.cpp

@@ -49,7 +49,7 @@ WebSocketHelper::WebSocketHelper(AbstractClientMessageFactory* messageFactory, L
     connect(m_socket, &QWebSocket::textFrameReceived, this, &WebSocketHelper::dataReceived);
     connect(m_socket, &QWebSocket::connected, this, &WebSocketHelper::onConnected);
     connect(m_socket, &QWebSocket::disconnected, this, &WebSocketHelper::onDisconnected);
-    connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), this, &WebSocketHelper::error);
+    connect(m_socket, &QWebSocket::errorOccurred, this, &WebSocketHelper::error);
 }
 
 WebSocketHelper::~WebSocketHelper()

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_abstract_sequence_widget.cpp

@@ -49,6 +49,7 @@ void LtsAbstractSequenceWidget::getValue(QWidget *data,
     return;
 
   data = findChild<QWidget *>(findObjectName);
+  Q_UNUSED(data);
 }
 
 void LtsAbstractSequenceWidget::setMemberCount(int count)

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_date_time_edit.cpp

@@ -22,6 +22,7 @@
 #include <QtWidgets/QCheckBox>
 #include <QtWidgets/QCompleter>
 #include <QtCore/QDateTime>
+#include <QtCore/QTimeZone>
 #include <QtWidgets/QGridLayout>
 #include <QtWidgets/QHBoxLayout>
 #include <QtGui/QKeyEvent>
@@ -248,7 +249,7 @@ int getItemValue(QSpinBox *spinBox)
 LtsDateTimeEdit::LtsDateTimeEdit(QWidget *parent, bool withNowButton, bool checkable)
   : QWidget(parent)
 //  , m_uiLe(new Ui::LtsDateTimeEditLe)
-  , m_scFixed(new QShortcut(QKeySequence(Qt::ShiftModifier + Qt::Key_F2), this, SLOT(setFixedDateTime()), nullptr, Qt::WidgetWithChildrenShortcut))
+  , m_scFixed(new QShortcut(QKeySequence(Qt::ShiftModifier | Qt::Key_F2), this, SLOT(setFixedDateTime()), nullptr, Qt::WidgetWithChildrenShortcut))
   , m_scOffset(new QShortcut(QKeySequence(Qt::Key_F2), this, SLOT(setOffsetDateTime()), nullptr, Qt::WidgetWithChildrenShortcut))
   , m_checkable(checkable) // see below
   , m_withNowButton(withNowButton) // see below
@@ -551,7 +552,7 @@ bool LtsDateTimeEdit::setMsecsSinceEpoch(qint64 msec, bool setToNearestPossible)
   m_curTimeMSec = msec;
 
   const qint64 offsetTimeZoneMsec = getTimezoneAsSecs() * 1000;
-  const QDateTime datetime(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec + offsetTimeZoneMsec, Qt::UTC));
+  const QDateTime datetime(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec + offsetTimeZoneMsec, QTimeZone(0)));
   const QDate date(datetime.date());
   const QTime time(datetime.time());
 
@@ -940,7 +941,7 @@ bool LtsDateTimeEdit::isDataAcceptable()
     return false;
   }
 
-  qint64 msec = QDateTime(QDate(getYear(), getMonth(), getDay()), QTime(getHour(), getMinute(), getSecond()), Qt::UTC).toMSecsSinceEpoch();
+  qint64 msec = QDateTime(QDate(getYear(), getMonth(), getDay()), QTime(getHour(), getMinute(), getSecond()), QTimeZone(0)).toMSecsSinceEpoch();
   msec -= DTG::timezone2Secs(getTimezone()) * 1000LL;
   if (m_minTimeMSec > 0 && m_maxTimeMSec > 0 && m_minTimeMSec < m_maxTimeMSec)
   {
@@ -1539,7 +1540,7 @@ void LtsDateTimeEdit::onFocusOutDay()
     {
       if (m_getCurrentTimeCallback)
       {
-        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), Qt::UTC));
+        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), QTimeZone(0)));
         setDay(dt.date().day());
       }
     }
@@ -1571,7 +1572,7 @@ void LtsDateTimeEdit::onFocusOutHHMMSS()
     {
       if (m_getCurrentTimeCallback)
       {
-        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), Qt::UTC));
+        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), QTimeZone(0)));
         setHHMMSS(dt.time().hour(), dt.time().minute(), dt.time().second());
       }
     }
@@ -1632,7 +1633,7 @@ void LtsDateTimeEdit::onFocusOutMonth()
     {
       if (m_getCurrentTimeCallback)
       {
-        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), Qt::UTC));
+        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), QTimeZone(0)));
         setMonth(dt.date().month());
       }
     }
@@ -1671,7 +1672,7 @@ void LtsDateTimeEdit::onFocusOutYear()
     {
       if (m_getCurrentTimeCallback)
       {
-        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), Qt::UTC));
+        const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_getCurrentTimeCallback(), QTimeZone(0)));
         setYear(dt.date().year());
       }
     }
@@ -1768,7 +1769,7 @@ void LtsDateTimeEdit::onMonthWheelEvent(bool bForward, int cursorPos)
   if (!isMonthAcceptable())
     return;
   const int ofs = bForward ? 1 : -1;
-  const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec, Qt::UTC).addMonths(ofs));
+  const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec, QTimeZone(0)).addMonths(ofs));
   setMsecsSinceEpoch(dt.toMSecsSinceEpoch(), true);
   m_uiLe->leLongMonth->setCursorPosition(cursorPos);
   m_uiLe->leLongMonth->setSelection(0, 3);
@@ -1782,7 +1783,7 @@ void LtsDateTimeEdit::onYearWheelEvent(bool bForward, int cursorPos)
   if (!isYearAcceptable())
     return;
   const int ofs = bForward ? 1 : -1;
-  const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec, Qt::UTC).addYears(ofs));
+  const QDateTime dt(QDateTime::fromMSecsSinceEpoch(m_curTimeMSec, QTimeZone(0)).addYears(ofs));
   setMsecsSinceEpoch(dt.toMSecsSinceEpoch(), true);
   m_uiLe->leLongYear->setCursorPosition(cursorPos);
   m_uiLe->leLongYear->setSelection(0, 2);