Close bld/OSG floor: OSG 3.4.1 from source + port osgQt to Qt6 + wire BgViewer dtEntity

Migrate BuildingViewer (16 files: DDS members, m_logger inits, QOpenGLWidget); gui:3:bld.info + gui:3:bdv now load

ci/Dockerfile.ci

@@ -27,11 +27,9 @@ 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
@@ -54,7 +52,6 @@ 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

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

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

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

@@ -18,10 +18,6 @@ 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)
@@ -44,11 +40,6 @@ 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})
@@ -219,8 +210,12 @@ OPTION(BUILD_PLUGINS_PLANEDITOR "Build PlanEditor plugin (requires Qt6 WebEngine
 OPTION(BUILD_PLUGINS_ONLINEHELP "Build OnlineHelp plugin (requires Qt6 WebEngine)" OFF)
 OPTION(BUILD_PLUGINS_SERVICEMONITOR "Build ServiceMonitor plugin (requires Qt6 WebEngine)" OFF)
 OPTION(BUILD_PLUGINS_PARTICIPANT_ORG_CHART "Build ParticipantOrgChart (requires Qt6 WebEngine)" OFF)
-OPTION(BUILD_PLUGINS_MSDL "Build MSDL module (requires Qt6 XmlPatterns)" OFF)
+# MSDL/Saab no longer require Qt XmlPatterns (removed in Qt 6.0): their import
-OPTION(BUILD_PLUGINS_SAAB "Build Saab module (requires Qt6 XmlPatterns)" OFF)
+# code was re-implemented with Qt6::Xml (QDomDocument) for the schema check plus
+# the external xmllint step for real XSD validation; MSDL additionally links
+# XercesC + uses xsdc++-generated tree classes (needs libxerces-c-dev + xsdcxx).
+OPTION(BUILD_PLUGINS_MSDL "Build MSDL module (needs XercesC + xsdc++)" OFF)
+OPTION(BUILD_PLUGINS_SAAB "Build Saab module (Qt6::Xml only)" 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
@@ -263,19 +258,13 @@ IF(WIN32)
 ELSE()
   # Linux: ArcGIS SDK Pfad konfigurieren (nur wenn BUILD_ARCGIS=ON)
   IF(BUILD_ARCGIS)
-    # Use environment variable ARCGIS_ROOT if set, otherwise check relative to source dir, then Docker/host paths
+    # Use environment variable ARCGIS_ROOT if set, otherwise default to /workspace/external/... (Docker) or host path
     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 "" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
+      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")
     ENDIF()
     IF(EXISTS "${ARCGIS_SDK_DIR}")
       LIST(APPEND CMAKE_PREFIX_PATH "${ARCGIS_SDK_DIR}")
@@ -295,6 +284,12 @@ 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)
@@ -344,7 +339,7 @@ endif()
 # server uses QWebSocketServer; LtsWebSocket/httq enable their real websocket
 # paths via QT6_WEBSOCKETS_AVAILABLE when the module is found).
 find_package(Qt6 6.2 COMPONENTS Concurrent Core LinguistTools Network
-  Multimedia Sql SerialPort Test Xml Positioning Svg WebSockets PrintSupport OpenGL OpenGLWidgets QUIET)
+  Multimedia Sql SerialPort Test Xml Positioning Svg WebSockets PrintSupport OpenGL QUIET)
 
 if(Qt6_FOUND)
   # Skip GUI find_package - it fails without OpenGL. We'll create manual targets below.
@@ -354,7 +349,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 OpenGLWidgets PrintSupport
+  find_package(Qt6 6.2 COMPONENTS Concurrent Core LinguistTools Network OpenGL PrintSupport
     Multimedia Sql Svg SerialPort Test UiTools WebSockets WebEngineCore WebEngineWidgets
     Widgets Xml Positioning QUIET)
   if(Qt6_FOUND AND OpenGL_FOUND)
@@ -369,6 +364,27 @@ if(NOT Qt6_FOUND)
   message(STATUS "Found Qt6 (minimal): ${Qt6Core_VERSION}")
 endif()
 
+# MSDL/Saab import libs (gated by BUILD_PLUGINS_MSDL / BUILD_PLUGINS_SAAB) no
+# longer use Qt XmlPatterns (QXmlSchema/QXmlSchemaValidator), which was removed
+# in Qt 6.0. They were re-implemented with Qt6::Xml (QDomDocument) for the
+# schema well-formedness check plus the external xmllint step for real XSD
+# validation; MSDL additionally links XercesC and uses xsdc++-generated tree
+# classes. No Qt6::XmlPatterns lookup is needed any more.
+
+# Qt6::WebChannel (consumed by PpmOrgChartGuiPlugin's QWebChannel page setup):
+# in Qt5 Qt5::WebEngineWidgets transitively linked Qt5::WebChannel (Qt5's
+# webengine depended on webchannel), but Qt6 dropped that dependency, so the
+# module must be found and linked explicitly. Separate QUIET find - never let
+# a missing optional component flip Qt6_FOUND off.
+if(NOT TARGET Qt6::WebChannel)
+  find_package(Qt6 6.2 COMPONENTS WebChannel QUIET)
+  if(Qt6WebChannel_FOUND)
+    message(STATUS "Found Qt6WebChannel")
+  else()
+    message(STATUS "Qt6WebChannel not found (PpmOrgChartGuiPlugin requires it; keep BUILD_PLUGINS_PARTICIPANT_ORG_CHART OFF)")
+  endif()
+endif()
+
 # Manual Qt6 configuration - create imported targets for available libraries
 if(NOT TARGET Qt6::Core)
   find_package(Qt6 6.2 COMPONENTS Core REQUIRED)
@@ -724,12 +740,6 @@ 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
 #
@@ -737,15 +747,10 @@ 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: /repo/external/rti_connext_dds-7.7.0 (current) or /workspace/external/rti_connext_dds-7.7.0 (old)
+    # In Docker container: /workspace/external/rti_connext_dds-7.7.0
     # On host: ${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0
-    IF(EXISTS "/repo/external/rti_connext_dds-7.7.0")
+    IF(EXISTS "/workspace/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")

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

@@ -256,8 +256,7 @@ cd build4 && ctest --output-on-failure
 
 ### Path Configuration
 - **Working Directory:** `/home/torsten/sandbox/qt6-migration-pipeline`
-- **Docker Mount Root:** `/repo` (configurable via `--docker-mount-root` or `DOCKER_MOUNT_ROOT` env var)
+- **Docker Container Path:** `/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus`
-- **Docker Container Path:** `${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus`
 - **Test Executables:** `build4/bin/<Configuration>/`
 
 ---

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

@@ -192,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)
-  // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled)
+  QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
   QNetworkProxy::setApplicationProxy(QNetworkProxy()); // do NOT use proxies anywhere!
 
   NGL::LoggerHandler *lh = NGL::LoggerHandler::getLoggerHandler();

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

@@ -23,7 +23,7 @@ int main(int argc, char **argv)
   QNetworkProxy::setApplicationProxy(QNetworkProxy());
   NGLApplication app(argc, argv);
   app.createLogger("SRP");
-  // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled)
+  app.setAttribute(Qt::AA_UseHighDpiPixmaps);
 
   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"));
-  // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled)
+  app.setAttribute(Qt::AA_UseHighDpiPixmaps);
 
   QDir::setSearchPaths(QLatin1String("icon"), QStringList(QLatin1String(":/style/")));
   Q_INIT_RESOURCE(rme_light_style);

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

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

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

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

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

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

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

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

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
-    $<IF:$<TARGET_EXISTS:Qt6::Svg>,Qt6::Svg,>
+    Qt6::Svg
     ngltools
     ngltranslator
     NGLLogger

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

@@ -39,9 +39,7 @@
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QScrollArea>
 #include <QScroller>
-#ifdef QT_SVG_LIB
+#include <QSvgRenderer>
-#include <QtSvg/QSvgRenderer>
-#endif
 #include <QtCore/QTimer>
 #include <QtWidgets/QToolButton>
 #include <QtCore/QPropertyAnimation>
@@ -401,7 +399,6 @@ 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);
@@ -413,9 +410,6 @@ 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_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_msec_date_time_edit.cpp

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

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

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

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

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

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

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

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/buildingmanager.h

@@ -125,7 +125,8 @@ class Shot
     Shot(const int32_t id, const osg::Vec3d& shooterPos, const osg::Vec3d& targetPos, int buildingIdSrc,
          int rommNumberSrc, int buildingIdDst, int rommNumberDst, int lineType, const osg::Vec4& color,
          unsigned int duration_s, unsigned int durationMax_s, double simTimeCreated)
-        : mId(id), mShooterPos(shooterPos), mTargetPos(targetPos), mBuildingIdSrc(buildingIdSrc),
+        : m_logger(BuildingViewer::getLogger("Shot")), mId(id), mShooterPos(shooterPos),
+          mTargetPos(targetPos), mBuildingIdSrc(buildingIdSrc),
           mRoomNumberSrc(rommNumberSrc), mBuildingIdDst(buildingIdDst), mRoomNumberDst(rommNumberDst),
           mLineType(lineType), mColor(color), mDuration_s(duration_s), m_DurationMax_s(durationMax_s),
           mSimTimeCreated(simTimeCreated)

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewerinterfaceimpl.cpp

@@ -180,6 +180,7 @@ CtrlImpl::CtrlImpl(dtEntity::EntityManager &em, QWidget *parentWidget)
   , mPaused(false)
   , mNonRealtimeMode(false)
   , mFrameRate(30)
+  , m_logger(BuildingViewer::getLogger("CtrlImpl"))
 {
   if (!mEntityManager->GetES(mMapSystem) ||
       !mEntityManager->GetES(mPlayerSystem))

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/viewwidget.cpp

@@ -3,7 +3,7 @@
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QVBoxLayout>
 #include <QtCore/QEvent>
-#include <QGLWidget>
+#include <QtOpenGLWidgets/QOpenGLWidget>
 #include <QWindow>
 #include <dtEntity/log.h>
 
@@ -176,7 +176,7 @@ void ViewWidget::viewModeChanged()
 
 bool ViewWidget::isOpenGlWindowExposed() const
 {
-  QGLWidget *gl = qobject_cast<QGLWidget*>(m_pView);
+  QOpenGLWidget *gl = qobject_cast<QOpenGLWidget*>(m_pView);
   if (!gl || !gl->windowHandle())
     return false;
   return gl->windowHandle()->isExposed();

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/BgViewer/viewerCtrl/visitors.cpp

@@ -4,7 +4,6 @@
 #include <osg/Material>
 #include <osg/BlendFunc>
 #include <osg/BlendColor>
-#include <QStringView>
 #include <QtCore/QVector>
 
 namespace VCtrl
@@ -87,10 +86,11 @@ void SplitVisitor::apply(osg::Group &node)
     for (unsigned int i = 0; i < node.getNumDescriptions(); ++i)
     {
       QString descr = QString::fromStdString(node.getDescription(i));
-      const QVector<QStringView> descprt = QStringView(descr).split(QLatin1Char(';'));
+      // Qt6: QStringRef removed; split()/splitRef() both return QVector<QString>
-      for (const QStringView &prt : descprt)
+      const QVector<QString> descprt = descr.split(QLatin1Char(';'));
+      for (const QString &prt : descprt)
       {
-        const QVector<QStringView> items = prt.split(QLatin1Char('='));
+        const QVector<QString> items = prt.split(QLatin1Char('='));
         if (items.size() == 2 && items[0] == QLatin1String("base_height"))
           h = items[1].toFloat();
       }

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

@@ -113,6 +113,7 @@ if(QT6_GUI_AVAILABLE)
   NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
     PRIVATE
       Qt6::OpenGL
+      Qt6::OpenGLWidgets
       ${OPENGL_LIBRARIES}
       ${BGVIEWER_DTENTITYOSG_LIBRARY}
       ${BGVIEWER_DTENTITY_LIBRARY}
@@ -126,6 +127,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(BuildingViewerCommon
     ${CMAKE_CURRENT_SOURCE_DIR}/BgViewer/viewerCtrl
     ${CMAKE_CURRENT_SOURCE_DIR}/../share
     ${OSG_INCLUDE_DIR}
+    ${BGVIEWER_INCLUDE_DIR}
 )
 
 IF (NOT WIN32)

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_communication_interface_internal.cpp

@@ -3,6 +3,7 @@
 #include "bdv_communication_interface_internal.h"
 
 #include <ParticipantManagement/ppm_translation.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QtCore/QTimer>
 #include <cassert>
 #include <utility>
@@ -29,7 +30,8 @@ static inline std::string createRoomNumberString(int roomNumber)
 }
 
 CommunicationInterfaceInternal::CommunicationInterfaceInternal(VCtrl::ViewerInterface* pviewerInterface)
-    : m_pviewerInterface(pviewerInterface)
+    : m_pviewerInterface(pviewerInterface),
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.CommunicationInterfaceInternal"))
 {
     assert(m_pviewerInterface);
 }
@@ -203,10 +205,10 @@ void CommunicationInterfaceInternal::setTeamConfiguration(const QMap<qint32, Par
     for (const ParticipantManagement::Party& party : parties)
     {
         BdvParty bdvParty;
-        bdvParty.id = party.id();
+        bdvParty.id = party.id;
-        bdvParty.name = ParticipantManagement::trPartyName(party.name());
+        bdvParty.name = ParticipantManagement::trPartyName(party.name);
 
-        const uint32_t argb = party.color();
+        const uint32_t argb = party.color;
         bdvParty.color.w = (((argb >> 24) & 0xff) / 255.);
         bdvParty.color.x = (((argb >> 16) & 0xff) / 255.);
         bdvParty.color.y = (((argb >> 8) & 0xff) / 255.);
@@ -256,9 +258,9 @@ void CommunicationInterfaceInternal::systemSetMountingPoint(const Infrastructure
 {
     int buildingId = data.buildingId();
     const QString& mountingPointName = filename;
-    double x = data.relPosition().offsetX();
+    double x = data.relPosition().offsetX;
-    double y = data.relPosition().offsetY();
+    double y = data.relPosition().offsetY;
-    double z = data.relPosition().offsetZ();
+    double z = data.relPosition().offsetZ;
 
     const std::string buildingIdStr = createBuildingIdString(buildingId);
 
@@ -446,7 +448,8 @@ static inline bool isPlayerId(const std::string& playerIdString, int* playerId)
     const QString playerIdQString(QString::fromStdString(playerIdString));
     bool bOk = false;
     if (playerIdQString.startsWith(QLatin1String(PLAYER_PREFIX)))
-        *playerId = playerIdQString.midRef(QLatin1String(PLAYER_PREFIX).size()).toInt(&bOk);
+        // Qt6: QString::midRef removed; mid() returns the same substring by value.
+        *playerId = playerIdQString.mid(QLatin1String(PLAYER_PREFIX).size()).toInt(&bOk);
     return bOk;
 }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_controller.cpp

@@ -10,6 +10,7 @@
 #include <LtsAppManager/lts_app_manager.h>
 #include <LtsPluginManager/lts_plugin_manager.h>
 #include <LtsSession/lts_session.h>
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QtCore/QDir>
 #include <QtWidgets/QMessageBox>
 #include <ngltools/ngltools_filesystem.h>
@@ -22,7 +23,8 @@ static char* argv_dummy[] = {(char*)"Dummy"};
 
 BgViewerController::BgViewerController(QObject* parent)
     : QObject(parent), m_mainloop(argc_dummy, argv_dummy, nullptr), m_widgetStolen(false), m_comIfc(nullptr),
-      m_pBgViewerDDSController(nullptr), m_bgvApp(nullptr), m_tickTimer(new QTimer(this))
+      m_pBgViewerDDSController(nullptr), m_bgvApp(nullptr), m_tickTimer(new QTimer(this)),
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BgViewerController"))
 {
     m_tickTimer->setInterval(1000 / 25);
     connect(m_tickTimer, &QTimer::timeout, this, [this]() { m_mainloop.tick(); });

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp

@@ -322,11 +322,11 @@ void BuildingViewerDdsController::uninitialize()
 
 QPointF BuildingViewerDdsController::toRelativePosition(const Core::GeoPosition& geoPos) const
 {
-    if (std::isnan(geoPos.lon()) || std::isnan(geoPos.lat()) || qIsNull(geoPos.lon()) || qIsNull(geoPos.lat()))
+    if (std::isnan(geoPos.lon) || std::isnan(geoPos.lat) || qIsNull(geoPos.lon) || qIsNull(geoPos.lat))
         return {};
 
     LtsCoordTrans::UtmCoordinate coord(
-        LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon(), geoPos.lat(), m_baseCoordinate.zone));
+        LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon, geoPos.lat, m_baseCoordinate.zone));
     return coord.relativeTo(m_baseCoordinate);
 }
 
@@ -335,7 +335,7 @@ LtsUtils::QPoint3D BuildingViewerDdsController::toRelative3D(const Core::GeoPosi
     const auto ret = toRelativePosition(geoPos);
     if (ret.isNull())
         return {};
-    return LtsUtils::QPoint3D(ret.x(), ret.y(), geoPos.z());
+    return LtsUtils::QPoint3D(ret.x(), ret.y(), geoPos.z);
 }
 
 bool BuildingViewerDdsController::clear()
@@ -371,12 +371,12 @@ bool BuildingViewerDdsController::calcBaseCoordinate(
         if (!bAtLeasOneFound)
         {
             bAtLeasOneFound = true;
-            geoPosition = mse.geoPosition();
+            geoPosition = mse.geoPosition;
         }
         else
         {
-            geoPosition.lat() = std::min(geoPosition.lat(), mse.geoPosition().lat());
+            geoPosition.lat = std::min(geoPosition.lat, mse.geoPosition.lat);
-            geoPosition.lon() = std::min(geoPosition.lon(), mse.geoPosition().lon());
+            geoPosition.lon = std::min(geoPosition.lon, mse.geoPosition.lon);
         }
     }
     if (!bAtLeasOneFound)
@@ -384,7 +384,7 @@ bool BuildingViewerDdsController::calcBaseCoordinate(
         WARNING_LOG(m_logger) << "No building available in exercise " << m_exerciseId;
         return false;
     }
-    m_baseCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosition.lon(), geoPosition.lat());
+    m_baseCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPosition.lon, geoPosition.lat);
     return true;
 }
 
@@ -422,11 +422,11 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString& modelPat
             const auto bi = BuildingInfo::fromJson(ele.toObject());
             if (!bi.isValid())
                 continue;
-            mse.id(bi.id);
+            mse.id = bi.id;
-            mse.angle(bi.angleDegree);
+            mse.angle = bi.angleDegree;
-            mse.geoPosition(Core::GeoPosition(bi.position.x(), bi.position.y(), bi.position.z()));
+            mse.geoPosition = Core::GeoPosition(bi.position.x(), bi.position.y(), bi.position.z());
-            mse.name(bi.name.toStdString());
+            mse.name = bi.name.toStdString();
-            mseMap.insert(mse.id(), mse);
+            mseMap.insert(mse.id, mse);
         }
     }
     else
@@ -435,17 +435,17 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString& modelPat
         const auto mMap = m_ismDtc->mainStructureElements();
         for (const auto& mse : mMap)
         {
-            if (mse.modelId() == 0)
+            if (mse.modelId == 0)
                 continue;
             if (!m_ismDtc->isElementAssignedToExercise(mse, m_exerciseId))
             {
                 DEBUG_LOG(m_logger)
-                    << "Not writing mse with id " << mse.id()
+                    << "Not writing mse with id " << mse.id
                     << " to building xml file since it is not assigned to the current exercise which has id "
                     << m_exerciseId;
                 continue;
             }
-            mseMap.insert(mse.id(), mse);
+            mseMap.insert(mse.id, mse);
         }
     }
     INFO_LOG(m_logger) << getSessionInfo()
@@ -460,7 +460,7 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString& modelPat
     QXmlStreamWriter sw(&f);
     sw.setAutoFormatting(true);
     sw.setAutoFormattingIndent(2);
-    sw.setCodec("UTF-8");
+    // Qt6: QXmlStreamWriter::setCodec removed; it writes UTF-8 by default.
     sw.writeStartDocument(QStringLiteral("1.0"), true);
     sw.writeStartElement(QStringLiteral("MetaData"));
     {
@@ -478,28 +478,28 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString& modelPat
 
         for (const InfrastructureManagement::MainStructureElement& mse : std::as_const(mseMap))
         {
-            m_knownBuildings += mse.id();
+            m_knownBuildings += mse.id;
 
             sw.writeStartElement(QStringLiteral("Model"));
             sw.writeAttribute(QStringLiteral("Type"), QStringLiteral("House"));
             {
-                const QString name(QString::fromStdString(mse.name()));
+                const QString name(QString::fromStdString(mse.name));
                 sw.writeStartElement(QStringLiteral("Description"));
                 sw.writeAttribute(QStringLiteral("Name"), name);
                 sw.writeEndElement();
                 sw.writeStartElement(QStringLiteral("Feature"));
-                sw.writeAttribute(QStringLiteral("Id"), BuildingViewer::databaseId2FeatureId(mse.id()));
+                sw.writeAttribute(QStringLiteral("Id"), BuildingViewer::databaseId2FeatureId(mse.id));
                 sw.writeEndElement();
                 sw.writeStartElement(QStringLiteral("Orientation"));
 
-                sw.writeAttribute(QStringLiteral("Angle"), QString::number(360 - mse.angle()));
+                sw.writeAttribute(QStringLiteral("Angle"), QString::number(360 - mse.angle));
                 sw.writeEndElement();
 
-                const QPointF offset(toRelativePosition(mse.geoPosition()));
+                const QPointF offset(toRelativePosition(mse.geoPosition));
                 sw.writeStartElement(QStringLiteral("Position"));
                 sw.writeAttribute(QStringLiteral("X"), QString::number(offset.x(), 'f', 13));
                 sw.writeAttribute(QStringLiteral("Y"), QString::number(offset.y(), 'f', 13));
-                sw.writeAttribute(QStringLiteral("Z"), QString::number(mse.geoPosition().z(), 'f', 13));
+                sw.writeAttribute(QStringLiteral("Z"), QString::number(mse.geoPosition.z, 'f', 13));
                 sw.writeEndElement();
                 sw.writeStartElement(QStringLiteral("File"));
                 sw.writeAttribute(QStringLiteral("Name"), name + QStringLiteral(".flt"));
@@ -552,7 +552,7 @@ void BuildingViewerDdsController::onReplayChanged(const SituationReplay::SitRepl
 {
     Q_UNUSED(modType)
 
-    switch (srp.state())
+    switch (srp.state)
     {
         case SituationReplay::SrpState::Stopped:
             m_connection->setSimuationPace(1.0);
@@ -560,7 +560,7 @@ void BuildingViewerDdsController::onReplayChanged(const SituationReplay::SitRepl
             break;
         case SituationReplay::SrpState::Started:
         case SituationReplay::SrpState::Resumed:
-            m_connection->setSimuationPace(srp.pace());
+            m_connection->setSimuationPace(srp.pace);
 
             break;
         case SituationReplay::SrpState::Paused:
@@ -629,7 +629,7 @@ void BuildingViewerDdsController::handleMountingPoint(const InfrastructureManage
             return;
     }
 
-    QVector3D position(mp.relPosition().offsetX(), mp.relPosition().offsetY(), mp.relPosition().offsetZ());
+    QVector3D position(mp.relPosition().offsetX, mp.relPosition().offsetY, mp.relPosition().offsetZ);
     QString strfeatureID = BuildingViewer::databaseId2FeatureId(mp.buildingId());
     QString strMountingPointID = strfeatureID + QStringLiteral("_MountingPoint_") + QString::number(mountingPointId);
 
@@ -712,7 +712,7 @@ void BuildingViewerDdsController::setCurrentTrainingAreaMap(const QString& model
 
 bool BuildingViewerDdsController::isValidParticipant(const ParticipantManagement::Participant& participant) const
 {
-    if (participant.id() == 0)
+    if (participant.id == 0)
     {
         if (m_logger.isDebugEnabled())
             DEBUG_LOG(m_logger) << getSessionInfo()
@@ -720,32 +720,32 @@ bool BuildingViewerDdsController::isValidParticipant(const ParticipantManagement
         return false;
     }
 
-    if (participant.isDeleted())
+    if (participant.isDeleted)
     {
         DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling participant with id "
-                            << participant.id() << " since it is marked as 'deleted'";
+                            << participant.id << " since it is marked as 'deleted'";
         return false;
     }
 
     if (m_session == nullptr)
         return false;
 
-    if (!m_session->isVisibleParty(participant.partyId()))
+    if (!m_session->isVisibleParty(participant.partyId))
     {
         DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling participant with id "
-                            << participant.id() << " since it is not visible for party with id "
+                            << participant.id << " since it is not visible for party with id "
-                            << participant.partyId();
+                            << participant.partyId;
         return false;
     }
 
     if (!m_ppmDtc)
         return false;
 
-    ParticipantManagement::TypeClass tc = m_ppmDtc->type(participant.typeId()).typeClass();
+    ParticipantManagement::TypeClass tc = m_ppmDtc->type(participant.typeId).typeClass;
     if (tc == ParticipantManagement::TypeClass::SupportUnit || tc == ParticipantManagement::TypeClass::Unit)
     {
         DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling participant with id "
-                            << participant.id() << " since its type is 'SupportUnit', 'Unit' or 'Structure'";
+                            << participant.id << " since its type is 'SupportUnit', 'Unit' or 'Structure'";
         return false;
     }
 
@@ -787,7 +787,7 @@ void BuildingViewerDdsController::createParticipants()
     auto cb = [this, &positionMap, sizeL](const ParticipantManagement::Participant& part) {
         if (!isValidParticipant(part))
             return;
-        createParticipant(part, positionMap.value(part.id()), sizeL);
+        createParticipant(part, positionMap.value(part.id), sizeL);
     };
     m_ppmDtc->participants(cb);
 
@@ -826,7 +826,7 @@ void BuildingViewerDdsController::onBoobyTrapChanged(const AreaEffectSimulation:
     switch (modType)
     {
         case DataModification::eModified:
-            deleteParticipant(990000 + boobyTrap.id());
+            deleteParticipant(990000 + boobyTrap.id);
             Q_FALLTHROUGH();
         case DataModification::eAdded: {
             int sizeL = LtsUtils::OperatorSettings::getInstance()
@@ -836,7 +836,7 @@ void BuildingViewerDdsController::onBoobyTrapChanged(const AreaEffectSimulation:
             break;
         }
         case DataModification::eRemoved: {
-            deleteParticipant(990000 + boobyTrap.id());
+            deleteParticipant(990000 + boobyTrap.id);
             break;
         }
     }
@@ -851,17 +851,17 @@ void BuildingViewerDdsController::onParticipantChanged(const ParticipantManageme
     switch (modType)
     {
         case DataModification::eModified:
-            deleteParticipant(participant.id());
+            deleteParticipant(participant.id);
             Q_FALLTHROUGH();
         case DataModification::eAdded: {
             int sizeL = LtsUtils::OperatorSettings::getInstance()
                             ->value(QStringLiteral("BgViewer"), QStringLiteral("PlayerSymbolSize"), 20)
                             .toInt();
-            createParticipant(participant, m_ppmDtc->participantPosition(participant.id()), sizeL);
+            createParticipant(participant, m_ppmDtc->participantPosition(participant.id), sizeL);
             break;
         }
         case DataModification::eRemoved: {
-            deleteParticipant(participant.id());
+            deleteParticipant(participant.id);
             break;
         }
     }
@@ -878,8 +878,8 @@ void BuildingViewerDdsController::onDynParticipantChanged(const ParticipantManag
         case DataModification::eAdded:
         case DataModification::eModified:
             if (m_ppmDtc)
-                createParticipant(m_ppmDtc->participant(data.participantId()),
+                createParticipant(m_ppmDtc->participant(data.participantId),
-                                  m_ppmDtc->participantPosition(data.participantId()), sizeL);
+                                  m_ppmDtc->participantPosition(data.participantId), sizeL);
             break;
         case DataModification::eRemoved: {
             break;
@@ -890,12 +890,12 @@ void BuildingViewerDdsController::onDynParticipantChanged(const ParticipantManag
 void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManagement::HitLineInfo& hli,
                                                        DataModification modType)
 {
-    DEBUG_LOG(m_logger) << "X 0000 onHitLineInfoChanged id=" << hli.id();
+    DEBUG_LOG(m_logger) << "X 0000 onHitLineInfoChanged id=" << hli.id;
 
     if (modType == DataModification::eRemoved)
     {
-        DEBUG_LOG(m_logger) << "onHitLineInfoChanged removeHit id=" << hli.id();
+        DEBUG_LOG(m_logger) << "onHitLineInfoChanged removeHit id=" << hli.id;
-        m_connection->removeRoomHit(hli.id());
+        m_connection->removeRoomHit(hli.id);
         return;
     }
 
@@ -903,24 +903,24 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
         return;
     m_ppmDtc->waitForHistoricalDataParticipant();
 
-    const ParticipantManagement::Participant& partSrc = m_ppmDtc->participant(hli.originatorParticipantId());
+    const ParticipantManagement::Participant& partSrc = m_ppmDtc->participant(hli.originatorParticipantId);
-    const ParticipantManagement::Participant& partDst = m_ppmDtc->participant(hli.injuryParticipantId());
+    const ParticipantManagement::Participant& partDst = m_ppmDtc->participant(hli.injuryParticipantId);
-    if (partSrc.id() == 0 || partDst.id() == 0)
+    if (partSrc.id == 0 || partDst.id == 0)
     {
-        ERROR_LOG(m_logger) << "no knownn part: " << partSrc.id() << " dst: " << partDst.id();
+        ERROR_LOG(m_logger) << "no knownn part: " << partSrc.id << " dst: " << partDst.id;
         return;
     }
 
-    const QString& strFeatureID = BuildingViewer::databaseId2FeatureId(hli.injuryBuildingId());
+    const QString& strFeatureID = BuildingViewer::databaseId2FeatureId(hli.injuryBuildingId);
     if (!m_viewerInterface->isViewOpen(strFeatureID.toStdString()))
     {
         DEBUG_LOG(m_logger) << "building not opened:  hli.buildingId()=" << hli;
         return;
     }
 
-    if (hli.injuryBuildingId() != 0)
+    if (hli.injuryBuildingId != 0)
     {
-        auto itBuildingHit = m_buildingHits.constFind(hli.injuryBuildingId());
+        auto itBuildingHit = m_buildingHits.constFind(hli.injuryBuildingId);
         if (itBuildingHit != m_buildingHits.constEnd())
         {
             const QVector<BuildingHit>& bHits = itBuildingHit.value();
@@ -929,14 +929,14 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
             for (const BuildingHit& bh : bHits)
             {
 
-                const bool testFlag = (bh.chargeTypeId == hli.chargeTypeId() &&
+                const bool testFlag = (bh.chargeTypeId == hli.chargeTypeId &&
-                                       bh.originatorParticipantId == hli.originatorParticipantId() &&
+                                       bh.originatorParticipantId == hli.originatorParticipantId &&
-                                       hli.sampleTime() - m_hitlineDuration_ms < bh.sampleTime);
+                                       hli.sampleTime - m_hitlineDuration_ms < bh.sampleTime);
                 DEBUG_LOG(m_logger) << "testFlag " << testFlag;
 
-                if (bh.chargeTypeId == hli.chargeTypeId() &&
+                if (bh.chargeTypeId == hli.chargeTypeId &&
-                    bh.originatorParticipantId == hli.originatorParticipantId() &&
+                    bh.originatorParticipantId == hli.originatorParticipantId &&
-                    hli.sampleTime() - m_hitlineDuration_ms < bh.sampleTime)
+                    hli.sampleTime - m_hitlineDuration_ms < bh.sampleTime)
                     return;
             }
         }
@@ -950,32 +950,32 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
     DEBUG_LOG(m_logger) << "onHitLineInfoChanged createPlayerSymbols";
     createPlayerSymbols(partDst, sizeL);
 
-    LtsUtils::QPoint3D originatorSrc = toRelative3D(hli.originatorPos());
+    LtsUtils::QPoint3D originatorSrc = toRelative3D(hli.originatorPos);
-    LtsUtils::QPoint3D injuryDest = toRelative3D(hli.injuryPos());
+    LtsUtils::QPoint3D injuryDest = toRelative3D(hli.injuryPos);
 
     DEBUG_LOG(m_logger) << "onHitLineInfoChanged playerHit"
-                        << " hli.originatorPos() z=" << hli.originatorPos().z()
+                        << " hli.originatorPos() z=" << hli.originatorPos.z
-                        << " hli.injuryPos() z=" << hli.injuryPos().z() << " Src=" << originatorSrc.x() << "/"
+                        << " hli.injuryPos() z=" << hli.injuryPos.z << " Src=" << originatorSrc.x() << "/"
                         << originatorSrc.y() << "/" << originatorSrc.z() << " Dest= " << injuryDest.x() << "/"
                         << injuryDest.y() << "/" << injuryDest.z()
-                        << " hli.originatorBuildingId=" << hli.originatorBuildingId()
+                        << " hli.originatorBuildingId=" << hli.originatorBuildingId
-                        << " hli.originatorRoomId=" << hli.originatorRoomId()
+                        << " hli.originatorRoomId=" << hli.originatorRoomId
-                        << " hli.injuryBuildingId=" << hli.injuryBuildingId()
+                        << " hli.injuryBuildingId=" << hli.injuryBuildingId
-                        << " hli.injuryRoomId=" << hli.injuryRoomId();
+                        << " hli.injuryRoomId=" << hli.injuryRoomId;
 
     DEBUG_LOG(m_logger) << "Before z-correction:"
                         << " Src=" << originatorSrc.x() << "/" << originatorSrc.y() << "/" << originatorSrc.z()
                         << " Dest= " << injuryDest.x() << "/" << injuryDest.y() << "/" << injuryDest.z();
 
-    double zAddOriginator = m_buildingHeight.value(hli.originatorBuildingId(), 0);
+    double zAddOriginator = m_buildingHeight.value(hli.originatorBuildingId, 0);
-    double zAddInjury = m_buildingHeight.value(hli.injuryBuildingId(), 0);
+    double zAddInjury = m_buildingHeight.value(hli.injuryBuildingId, 0);
     DEBUG_LOG(m_logger) << "z-correction: zAddOriginator=" << zAddOriginator;
     DEBUG_LOG(m_logger) << "z-correction: zAddInjury=" << zAddInjury;
 
-    if (hli.originatorBuildingId() <= 0)
+    if (hli.originatorBuildingId <= 0)
         zAddOriginator = zAddInjury;
 
-    if (hli.injuryBuildingId() <= 0)
+    if (hli.injuryBuildingId <= 0)
         zAddInjury = zAddOriginator;
 
     originatorSrc.setZ(originatorSrc.z() + zAddInjury);
@@ -988,54 +988,55 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
     int buildingIdSrc = -1;
     int roomNumberSrc = -1;
     {
-        auto itId2Number = m_roomId2RoomNumber.constFind(hli.originatorBuildingId());
+        auto itId2Number = m_roomId2RoomNumber.constFind(hli.originatorBuildingId);
         if (itId2Number != m_roomId2RoomNumber.constEnd())
         {
             const auto& mapRooms = itId2Number.value();
-            const auto itRoom = mapRooms.constFind(hli.originatorRoomId());
+            const auto itRoom = mapRooms.constFind(hli.originatorRoomId);
             if (itRoom != mapRooms.constEnd())
             {
-                buildingIdSrc = hli.originatorBuildingId();
+                buildingIdSrc = hli.originatorBuildingId;
                 roomNumberSrc = itRoom.value();
             }
             else
                 WARNING_LOG(m_logger) << "onHitLineInfoChanged: Room id can not be mapped! Building id: "
-                                      << hli.injuryBuildingId() << ", originatorRoomId: " << hli.originatorRoomId();
+                                      << hli.injuryBuildingId << ", originatorRoomId: " << hli.originatorRoomId;
         }
     }
 
     int buildingIdDst = -1;
     int roomNumberDst = -1;
     {
-        auto itId2Number = m_roomId2RoomNumber.constFind(hli.injuryBuildingId());
+        auto itId2Number = m_roomId2RoomNumber.constFind(hli.injuryBuildingId);
         if (itId2Number != m_roomId2RoomNumber.constEnd())
         {
             const auto& mapRooms = itId2Number.value();
-            const auto itRoom = mapRooms.constFind(hli.injuryRoomId());
+            const auto itRoom = mapRooms.constFind(hli.injuryRoomId);
             if (itRoom != mapRooms.constEnd())
             {
-                buildingIdDst = hli.injuryBuildingId();
+                buildingIdDst = hli.injuryBuildingId;
                 roomNumberDst = itRoom.value();
             }
             else
                 WARNING_LOG(m_logger) << "onHitLineInfoChanged: Room id can not be mapped! Building id: "
-                                      << hli.injuryBuildingId() << ", room id: " << hli.injuryRoomId();
+                                      << hli.injuryBuildingId << ", room id: " << hli.injuryRoomId;
         }
     }
 
     DEBUG_LOG(m_logger) << "After translate buildingId, roomId:"
-                        << " hli.originatorBuildingId=" << hli.originatorBuildingId() << " -> " << buildingIdSrc
+                        << " hli.originatorBuildingId=" << hli.originatorBuildingId << " -> " << buildingIdSrc
-                        << " hli.originatorRoomId=" << hli.originatorRoomId() << " -> " << roomNumberSrc
+                        << " hli.originatorRoomId=" << hli.originatorRoomId << " -> " << roomNumberSrc
-                        << " hli.injuryBuildingId=" << hli.injuryBuildingId() << " -> " << buildingIdDst
+                        << " hli.injuryBuildingId=" << hli.injuryBuildingId << " -> " << buildingIdDst
-                        << " hli.injuryRoomId=" << hli.injuryBuildingId() << " -> " << roomNumberDst
+                        << " hli.injuryRoomId=" << hli.injuryBuildingId << " -> " << roomNumberDst
-                        << " hli.sampleTime=" << hli.sampleTime();
+                        << " hli.sampleTime=" << hli.sampleTime;
     int lineType = 2;
-    m_pdmDtc->chargeType(hli.chargeTypeId());
+    m_pdmDtc->chargeType(hli.chargeTypeId);
 
-    lineType = m_pdmDtc->getChargeTypeSpecialProperty(hli.chargeTypeId(), 0, 0);
+    // DDS enums are enum class; lineType is int.
+    lineType = static_cast<int>(m_pdmDtc->getChargeTypeSpecialProperty(hli.chargeTypeId, 0, 0));
 
-    m_connection->playerHit(hli.id(), partSrc.id(), partDst.id(), originatorSrc, injuryDest, buildingIdSrc,
+    m_connection->playerHit(hli.id, partSrc.id, partDst.id, originatorSrc, injuryDest, buildingIdSrc,
-                            roomNumberSrc, buildingIdDst, roomNumberDst, lineType, hli.sampleTime());
+                            roomNumberSrc, buildingIdDst, roomNumberDst, lineType, hli.sampleTime);
 }
 
 void BuildingViewerDdsController::onPartyChanged(const ParticipantManagement::Party& party, DataModification modType)
@@ -1046,7 +1047,7 @@ void BuildingViewerDdsController::onPartyChanged(const ParticipantManagement::Pa
     int sizeL = LtsUtils::OperatorSettings::getInstance()
                     ->value(QStringLiteral("BgViewer"), QStringLiteral("PlayerSymbolSize"), 20)
                     .toInt();
-    updatePlayerSymbols(sizeL, party.id());
+    updatePlayerSymbols(sizeL, party.id);
     syncTeams();
 }
 
@@ -1063,35 +1064,35 @@ void BuildingViewerDdsController::onPositionChanged(const ParticipantManagement:
 
     int buildingID = -1;
     int roomNumber = -1;
-    auto itId2Number = m_roomId2RoomNumber.constFind(position.buildingId());
+    auto itId2Number = m_roomId2RoomNumber.constFind(position.buildingId);
     if (itId2Number != m_roomId2RoomNumber.constEnd())
     {
         const auto& mapRooms = itId2Number.value();
-        const auto itRoom = mapRooms.constFind(position.roomId());
+        const auto itRoom = mapRooms.constFind(position.roomId);
         if (itRoom != mapRooms.constEnd())
         {
-            buildingID = position.buildingId();
+            buildingID = position.buildingId;
             roomNumber = itRoom.value();
         }
         else
         {
             WARNING_LOG(m_logger) << "onPositionChanged: Room id can not be mapped! Building id: "
-                                  << position.buildingId() << ", room id: " << position.roomId();
+                                  << position.buildingId << ", room id: " << position.roomId;
         }
     }
 
-    if ((roomNumber < 0) && (buildingID <= 0) && (position.buildingId() > 0) &&
+    if ((roomNumber < 0) && (buildingID <= 0) && (position.buildingId > 0) &&
-        (position.reportingSource() == Core::PositionReportingSource::Ops ||
+        (position.reportingSource == Core::PositionReportingSource::Ops ||
-         position.reportingSource() == Core::PositionReportingSource::Wls))
+         position.reportingSource == Core::PositionReportingSource::Wls))
     {
-        buildingID = position.buildingId();
+        buildingID = position.buildingId;
     }
 
-    const int playerId = position.participantId();
+    const int playerId = position.participantId;
     auto it = m_lastPositionTime.find(playerId);
     if (it == m_lastPositionTime.end())
     {
-        m_lastPositionTime.insert(playerId, position.sampleTime());
+        m_lastPositionTime.insert(playerId, position.sampleTime);
         if (isOutdatedPosition(position))
             m_connection->setPlayerVisible(playerId, false);
     }
@@ -1099,7 +1100,7 @@ void BuildingViewerDdsController::onPositionChanged(const ParticipantManagement:
     {
         if (isOutdatedPosition(it.value()) && !isOutdatedPosition(position))
             m_connection->setPlayerVisible(playerId, true);
-        it.value() = position.sampleTime();
+        it.value() = position.sampleTime;
     }
 
     if (buildingID <= 0 && roomNumber <= 0)
@@ -1118,8 +1119,8 @@ void BuildingViewerDdsController::onPositionChanged(const ParticipantManagement:
         return;
     }
 
-    m_connection->playerPlace(position.participantId(), toRelative3D(position.pos()), buildingID, roomNumber,
+    m_connection->playerPlace(position.participantId, toRelative3D(position.pos), buildingID, roomNumber,
-                              position.reportingSource());
+                              position.reportingSource);
 }
 
 void BuildingViewerDdsController::onParticipantGearEventChanged(const ParticipantManagement::ParticipantGearEvent& data,
@@ -1129,12 +1130,12 @@ void BuildingViewerDdsController::onParticipantGearEventChanged(const Participan
     {
         case DataModification::eAdded:
         case DataModification::eModified: {
-            m_participantGearEvents[data.participantId()] = data.sampleTime();
+            m_participantGearEvents[data.participantId] = data.sampleTime;
             break;
         }
         case DataModification::eRemoved: {
 
-            const int playerId = data.participantId();
+            const int playerId = data.participantId;
             m_participantGearEvents.remove(playerId);
             m_connection->playerUpdatePlayerSymbol(playerId, buildPlayerSymbolFilePath(playerId, cColorSymbolId));
             break;
@@ -1158,44 +1159,44 @@ void BuildingViewerDdsController::createParticipant(const ParticipantManagement:
 
     createPlayerSymbols(participant, sizeL);
 
-    m_connection->playerCreate(participant.id(), participant.partyId(), buildPlayerSymbolFilePath(participant.id()),
+    m_connection->playerCreate(participant.id, participant.partyId, buildPlayerSymbolFilePath(participant.id),
-                               toRelative3D(position.pos()), position.buildingId(),
+                               toRelative3D(position.pos), position.buildingId,
-                               m_roomId2RoomNumber.value(position.buildingId()).value(position.roomId()),
+                               m_roomId2RoomNumber.value(position.buildingId).value(position.roomId),
-                               position.reportingSource());
+                               position.reportingSource);
 
     const bool isOutdated = isOutdatedPosition(position);
-    const int participantId = participant.id();
+    const int participantId = participant.id;
     const bool isValid =
-        (position.buildingId() > 0 && m_roomId2RoomNumber.value(position.buildingId()).value(position.roomId()) > 0);
+        (position.buildingId > 0 && m_roomId2RoomNumber.value(position.buildingId).value(position.roomId) > 0);
     m_connection->setPlayerVisible(participantId, (!isOutdated && isValid));
-    m_lastPositionTime.insert(participantId, position.sampleTime());
+    m_lastPositionTime.insert(participantId, position.sampleTime);
 }
 
 void BuildingViewerDdsController::createBoobyTrap(const AreaEffectSimulation::BoobyTrap& trap, int sizeL)
 {
-    if (trap.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated &&
+    if (trap.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated &&
-        trap.effectStateId() != AreaEffectSimulation::AesEffectState::EsPrepared)
+        trap.effectStateId != AreaEffectSimulation::AesEffectState::EsPrepared)
         return;
 
     ParticipantManagement::Participant participant;
-    if (trap.partyId().has_value())
+    if (trap.partyId.has_value())
-        participant.partyId() = trap.partyId().get();
+        participant.partyId = trap.partyId.get();
-    participant.designator() = trap.name();
+    participant.designator = trap.name;
-    participant.designator() = trap.name();
+    participant.designator = trap.name;
-    participant.id() = trap.id() + 990000;
+    participant.id = trap.id + 990000;
-    participant.sampleTime() = trap.sampleTime();
+    participant.sampleTime = trap.sampleTime;
-    participant.symbol() = "AP6D|CMPL|10011500002104000000";
+    participant.symbol = "AP6D|CMPL|10011500002104000000";
 
     createPlayerSymbols(participant, sizeL);
     Core::GeoPosition pos;
-    pos.lat() = trap.impactPosition().lat();
+    pos.lat = trap.impactPosition.lat;
-    pos.lon() = trap.impactPosition().lon();
+    pos.lon = trap.impactPosition.lon;
 
-    DEBUG_LOG(m_logger) << "Try create Booby trap with id " << trap.id() << " internal id " << participant.id();
+    DEBUG_LOG(m_logger) << "Try create Booby trap with id " << trap.id << " internal id " << participant.id;
-    DEBUG_LOG(m_logger) << "Try create Booby trap with pos " << pos.lat() << " " << pos.lon();
+    DEBUG_LOG(m_logger) << "Try create Booby trap with pos " << pos.lat << " " << pos.lon;
-    m_connection->playerCreate(participant.id(), participant.partyId(), buildPlayerSymbolFilePath(participant.id()),
+    m_connection->playerCreate(participant.id, participant.partyId, buildPlayerSymbolFilePath(participant.id),
                                toRelative3D(pos), -1, -1, Core::PositionReportingSource::External);
-    m_connection->setPlayerVisible(participant.id(), true);
+    m_connection->setPlayerVisible(participant.id, true);
 }
 
 void BuildingViewerDdsController::updatePlayerSymbols(const int sizeL, const int forParty)
@@ -1207,7 +1208,7 @@ void BuildingViewerDdsController::updatePlayerSymbols(const int sizeL, const int
         if (!isValidParticipant(participant))
             return;
 
-        if (forParty == -1 || participant.partyId() == forParty)
+        if (forParty == -1 || participant.partyId == forParty)
             createPlayerSymbols(participant, sizeL);
     };
     m_ppmDtc->participants(cb);
@@ -1219,9 +1220,9 @@ void BuildingViewerDdsController::createPlayerSymbols(const ParticipantManagemen
     SymbolInfo symbolinfo;
     for (int i = 0; i < m_vecFlashColors.size(); ++i)
     {
-        Q_ASSERT(participant.id() != 0);
+        Q_ASSERT(participant.id != 0);
-        symbolinfo.participantId = participant.id();
+        symbolinfo.participantId = participant.id;
-        symbolinfo.strPathToSymbolFile = buildPlayerSymbolFilePath(participant.id(), i);
+        symbolinfo.strPathToSymbolFile = buildPlayerSymbolFilePath(participant.id, i);
         symbolinfo.color = m_vecFlashColors.at(i);
         symbolinfo.useThisSymbolNow = !symbolinfo.color.isValid();
         createSymbolResultWatcher(participant, symbolinfo, sizeL);
@@ -1304,7 +1305,7 @@ void BuildingViewerDdsController::reCheckHitLine()
 
         for (const auto& hli : hitMap)
         {
-            if (hli.sampleTime() < (m_session->partitionTime() - 3000))
+            if (hli.sampleTime < (m_session->partitionTime() - 3000))
                 onBuildingHitLineInfoChanged(hli, DataModification::eAdded);
         }
     }
@@ -1332,17 +1333,17 @@ void BuildingViewerDdsController::updateBuildingRoomNames(
     const InfrastructureManagement::MainStructureElement& building)
 {
 
-    const std::vector<InfrastructureManagement::StructureElement>& vecElements = building.elements();
+    const std::vector<InfrastructureManagement::StructureElement>& vecElements = building.elements;
 
-    int32_t buildingDatabaseId = building.id();
+    int32_t buildingDatabaseId = building.id;
     QString featureID = BuildingViewer::databaseId2FeatureId(buildingDatabaseId);
     for (const auto& se : vecElements)
     {
-        if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building)
+        if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Building)
-            m_connection->excSetBuildingDisplayName(featureID, QString::fromStdString(se.displayName()));
+            m_connection->excSetBuildingDisplayName(featureID, QString::fromStdString(se.displayName));
-        if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Room)
+        if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Room)
-            m_connection->excSetRoomDisplayName(featureID, QString::number(se.mountingPointId()),
+            m_connection->excSetRoomDisplayName(featureID, QString::number(se.mountingPointId),
-                                                QString::fromStdString(se.displayName()));
+                                                QString::fromStdString(se.displayName));
     }
 }
 
@@ -1429,25 +1430,25 @@ void BuildingViewerDdsController::onBuildingStateChanged(const Buildings::Buildi
         return;
 
     QMap<int, int> roomDestructions;
-    for (const Buildings::RoomState& rs : data.roomStates())
+    for (const Buildings::RoomState& rs : data.roomStates)
     {
-        roomDestructions.insert(rs.mountingPointId(), rs.damagePercent());
+        roomDestructions.insert(rs.mountingPointId, rs.damagePercent);
     }
 
-    m_connection->buildingHit(data.id(), data.id(), data.damagePercent(), roomDestructions);
+    m_connection->buildingHit(data.id, data.id, data.damagePercent, roomDestructions);
 }
 
 void BuildingViewerDdsController::onBuildingHitLineInfoChanged(const Buildings::BuildingHitLineInfo& hli,
                                                                DataModification modType)
 {
-    int topidId = static_cast<int>(hli.id());
+    int topidId = static_cast<int>(hli.id);
 
     DEBUG_LOG(m_logger) << "onBuildingHitLineInfoChanged: " << hli;
 
-    const QString& strFeatureID = BuildingViewer::databaseId2FeatureId(hli.buildingId());
+    const QString& strFeatureID = BuildingViewer::databaseId2FeatureId(hli.buildingId);
     if (!m_viewerInterface->isViewOpen(strFeatureID.toStdString()))
     {
-        DEBUG_LOG(m_logger) << "building not opened:  hli.buildingId()=" << hli.buildingId();
+        DEBUG_LOG(m_logger) << "building not opened:  hli.buildingId()=" << hli.buildingId;
         return;
     }
 
@@ -1457,28 +1458,28 @@ void BuildingViewerDdsController::onBuildingHitLineInfoChanged(const Buildings::
     if (isRemove)
     {
         DEBUG_LOG(m_logger) << "onBuildingHitLineInfoChanged: remove ";
-        QVector<BuildingHit>& bhl = m_buildingHits[hli.buildingId()];
+        QVector<BuildingHit>& bhl = m_buildingHits[hli.buildingId];
 
-        auto it = std::find_if(bhl.begin(), bhl.end(), [hli](const BuildingHit& bh) { return (bh.id == hli.id()); });
+        auto it = std::find_if(bhl.begin(), bhl.end(), [hli](const BuildingHit& bh) { return (bh.id == hli.id); });
 
         if (it != bhl.end())
         {
             DEBUG_LOG(m_logger) << "bhl.erase(it)";
             bhl.erase(it);
         }
-        m_connection->removeRoomHit(hli.id());
+        m_connection->removeRoomHit(hli.id);
         return;
     }
     else
     {
         BuildingHit bh;
-        bh.id = hli.id();
+        bh.id = hli.id;
-        bh.sampleTime = hli.sampleTime();
+        bh.sampleTime = hli.sampleTime;
-        bh.originatorParticipantId = hli.originatorParticipantId();
+        bh.originatorParticipantId = hli.originatorParticipantId;
-        bh.chargeTypeId = hli.chargeTypeId();
+        bh.chargeTypeId = hli.chargeTypeId;
 
         bool contains = false;
-        for (const auto& it : m_buildingHits[hli.buildingId()])
+        for (const auto& it : m_buildingHits[hli.buildingId])
         {
             if (it.id == bh.id)
                 contains = true;
@@ -1486,13 +1487,13 @@ void BuildingViewerDdsController::onBuildingHitLineInfoChanged(const Buildings::
         if (!contains)
         {
 
-            m_buildingHits[hli.buildingId()].push_back(bh);
+            m_buildingHits[hli.buildingId].push_back(bh);
         }
     }
     int lineType = 2;
 
-    m_connection->roomHit(topidId, hli.originatorParticipantId(), hli.buildingId(), hli.hitOnRoomId(),
+    m_connection->roomHit(topidId, hli.originatorParticipantId, hli.buildingId, hli.hitOnRoomId,
-                          toRelative3D(hli.originatorPos()), lineType, isRemove ? 0 : hli.sampleTime());
+                          toRelative3D(hli.originatorPos), lineType, isRemove ? 0 : hli.sampleTime);
 }
 
 void BuildingViewerDdsController::onCleanupBuildingHitlines()
@@ -1509,33 +1510,33 @@ void BuildingViewerDdsController::onCleanupBuildingHitlines()
 void BuildingViewerDdsController::onMainStructureElementChanged(
     const InfrastructureManagement::MainStructureElement& mse, DataModification modType)
 {
-    if (!isBuildingKnown(mse.id()))
+    if (!isBuildingKnown(mse.id))
         return;
 
     switch (modType)
     {
         case DataModification::eAdded:
         case DataModification::eModified: {
-            if (mse.modelId() != 0 && m_ismDtc->isElementAssignedToExercise(mse, m_exerciseId))
+            if (mse.modelId != 0 && m_ismDtc->isElementAssignedToExercise(mse, m_exerciseId))
             {
-                DEBUG_LOG(m_logger) << "m_buildingHeight.insert id=" << mse.id() << " z=" << mse.geoPosition().z();
+                DEBUG_LOG(m_logger) << "m_buildingHeight.insert id=" << mse.id << " z=" << mse.geoPosition.z;
-                m_buildingHeight.insert(mse.id(), mse.geoPosition().z());
+                m_buildingHeight.insert(mse.id, mse.geoPosition.z);
                 QHash<int, int> roomId2RoomNumber;
-                for (const InfrastructureManagement::StructureElement& se : mse.elements())
+                for (const InfrastructureManagement::StructureElement& se : mse.elements)
                 {
-                    if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::Room)
+                    if (se.structureElementTypeId != InfrastructureManagement::StructureElementType::Room)
                         continue;
-                    roomId2RoomNumber[se.id()] = se.mountingPointId();
+                    roomId2RoomNumber[se.id] = se.mountingPointId;
                 }
-                m_roomId2RoomNumber[mse.id()] = roomId2RoomNumber;
+                m_roomId2RoomNumber[mse.id] = roomId2RoomNumber;
 
                 updateBuildingRoomNames(mse);
             }
             break;
         }
         case DataModification::eRemoved:
-            m_roomId2RoomNumber.remove(mse.id());
+            m_roomId2RoomNumber.remove(mse.id);
-            m_buildingHeight.remove(mse.id());
+            m_buildingHeight.remove(mse.id);
             break;
     }
 }

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.h

@@ -89,7 +89,7 @@ class BuildingViewerDdsController : public QObject
 
     inline bool isOutdatedPosition(const ParticipantManagement::ParticipantPosition& position) const
     {
-        return position.participantId() <= 0 || isOutdatedPosition(position.sampleTime());
+        return position.participantId <= 0 || isOutdatedPosition(position.sampleTime);
     }
 
     bool calcBaseCoordinate(const QMap<qint32, InfrastructureManagement::MainStructureElement>& mseMap);

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_helper.cpp

@@ -22,7 +22,8 @@ int32_t featureId2DatabaseId(const QString &strFeatureId)
   if (!strFeatureId.startsWith(gStrFeatureIdPrefix))
     return -1;
   bool isOk = false;
-  int32_t buildingDatabaseId = strFeatureId.midRef(gStrFeatureIdPrefix.size()).toInt(&isOk);
+  // Qt6: QString::midRef removed; mid() returns the same substring by value.
+  int32_t buildingDatabaseId = strFeatureId.mid(gStrFeatureIdPrefix.size()).toInt(&isOk);
   return isOk ? buildingDatabaseId : -1;
 }
 }

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.cpp

@@ -4,6 +4,7 @@
 
 #include "bdv_edit_item.h"
 #include "ui_bdv_building_edit.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <Buildings/bld.hpp>
 #include <Buildings/bld_ftc.h>
@@ -16,7 +17,8 @@ namespace BuildingViewer
 {
 BuildingEdit::BuildingEdit(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel),
-      m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::BuildingEdit)
+      m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::BuildingEdit),
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BuildingEdit"))
 {
     m_ui->setupUi(this);
 
@@ -69,7 +71,7 @@ bool BuildingEdit::init(int32_t buildingDatabaseId,
     m_bldFtc = bldFtc;
 
     InfrastructureManagement::MainStructureElement building = m_ismDtc->mainStructureElement(m_buildingDatabaseId);
-    m_buildingId = building.id();
+    m_buildingId = building.id;
 
     buildModel();
     m_buildingName = m_model->getBuildingName();
@@ -158,14 +160,14 @@ bool BuildingEdit::apply()
     {
         m_requestHelper->addRequest([this, fortifyFactors]() {
             Buildings::SetFortifyFactorRequest fortifyRequest;
-            fortifyRequest.buildingId(m_buildingDatabaseId);
+            fortifyRequest.buildingId = m_buildingDatabaseId;
 
-            fortifyRequest.fortifyFactors().reserve(fortifyFactors.size());
+            fortifyRequest.fortifyFactors.reserve(fortifyFactors.size());
             for (const auto& e : fortifyFactors)
             {
                 DEBUG_LOG(m_logger) << "push_back= databaseId=" << e.structureElementId()
                                     << " fortifyFactor=" << e.fortifyFactor();
-                fortifyRequest.fortifyFactors().push_back(
+                fortifyRequest.fortifyFactors.push_back(
                     Buildings::FortifyFactor(e.structureElementId(), e.fortifyFactor()));
             }
 
@@ -184,12 +186,12 @@ bool BuildingEdit::apply()
         for (const auto& treeItem : displayNames)
         {
 
-            for (const auto& room : building.elements())
+            for (const auto& room : building.elements)
             {
-                if (room.id() == treeItem.structureElementId())
+                if (room.id == treeItem.structureElementId())
                 {
                     auto copy = room;
-                    copy.displayName(treeItem.displayName().toStdString());
+                    copy.displayName = treeItem.displayName().toStdString();
                     vecModifiedRooms.push_back(copy);
                     break;
                 }
@@ -231,7 +233,7 @@ void BuildingEdit::slotMainStructureElementChanged(const InfrastructureManagemen
     if (modType == DataModification::eRemoved)
         return;
 
-    if (mse.id() == m_buildingDatabaseId)
+    if (mse.id == m_buildingDatabaseId)
     {
 
         slotHandleExternalDdsChange();
@@ -243,7 +245,7 @@ void BuildingEdit::slotBuildingStateChanged(const Buildings::BuildingState& stat
     if (modType == DataModification::eRemoved)
         return;
 
-    if (state.id() == m_buildingDatabaseId)
+    if (state.id == m_buildingDatabaseId)
     {
 
         slotHandleExternalDdsChange();
@@ -265,11 +267,11 @@ bool BuildingEdit::sendBuildingStateRequest(ProjectDataManagement::Vulnerability
         buildings.resize(1);
         Buildings::SetBuildingStatesRequest requestData;
 
-        building.buildingId(m_buildingId);
+        building.buildingId = m_buildingId;
-        building.roomIds().set(structureElementIds);
+        building.roomIds.set(structureElementIds);
         buildings[0] = building;
-        requestData.buildings(buildings);
+        requestData.buildings = buildings;
-        requestData.vulnerabilityState(state);
+        requestData.vulnerabilityState = state;
 
         DEBUG_LOG(m_logger) << Q_FUNC_INFO << "currentData: " << state;
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp

@@ -17,11 +17,13 @@ namespace BuildingViewer
 BuildingEditModel::BuildingEditModel(QObject* parent,
                                      const std::shared_ptr<InfrastructureManagement::Interface::Dtc>& ismDtc,
                                      const std::shared_ptr<Buildings::Interface::Dtc>& bldDtc)
-    : NGLTreeModel(parent, new NGLTreeItem(QVariant()), ,
+    : NGLTreeModel(parent, new NGLTreeItem(QVariant()), {
-                   m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()){
                        tr("Selected Building"), QStringLiteral("Name (DEBUG)"),
                        QStringLiteral("MountingPointId (DEBUG)"), QStringLiteral("StructureElementId (DEBUG)"),
                        tr("Fortify Factor"), tr("Damage Percent")}),
+      // m_logger moved out of the NGLTreeModel(...) call (it is a member init);
+      // getNGLLogger() returns the INGLLogger& the reference member binds to.
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BuildingEditModel")),
       m_ismDtc(ismDtc), m_bldDtc(bldDtc), m_buildingName(QString())
 {
 }
@@ -125,11 +127,11 @@ bool BuildingEditModel::init(int32_t mseId)
     int rootId = 0;
     qint32 mapId = 0;
 
-    const std::vector<InfrastructureManagement::StructureElement>& vecElements = building.elements();
+    const std::vector<InfrastructureManagement::StructureElement>& vecElements = building.elements;
     for (const auto& se : vecElements)
     {
         DEBUG_LOG(m_logger) << "se: " << se;
-        if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building)
+        if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Building)
         {
             BuildingViewer::TreeItem rootItemBuilding(se);
             rootName = rootItemBuilding.name();
@@ -142,12 +144,12 @@ bool BuildingEditModel::init(int32_t mseId)
     for (const auto& se : vecElements)
     {
         DEBUG_LOG(m_logger) << "se: =" << se;
-        if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Floor)
+        if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Floor)
         {
             BuildingViewer::TreeItem itemRoom(se);
             itemRoom.setSuperior(rootId);
 
-            lookupFloorId2TreeId[se.id()] = mapId;
+            lookupFloorId2TreeId[se.id] = mapId;
             treemap[mapId++] = itemRoom;
         }
     }
@@ -158,20 +160,20 @@ bool BuildingEditModel::init(int32_t mseId)
     auto bs = m_bldDtc->buildingState(mseId);
 
     QMap<int32_t, Buildings::RoomState> roomStates;
-    for (const auto& e : bs.roomStates())
+    for (const auto& e : bs.roomStates)
-        roomStates[e.id()] = e;
+        roomStates[e.id] = e;
 
     for (const auto& se : vecElements)
     {
-        if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Room)
+        if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Room)
         {
 
             double fortifyFactor = 1.0;
-            qint32 damagePercent = bs.damagePercent();
+            qint32 damagePercent = bs.damagePercent;
-            if (roomStates.contains(se.id()))
+            if (roomStates.contains(se.id))
             {
-                fortifyFactor = roomStates[se.id()].fortifyFactor();
+                fortifyFactor = roomStates[se.id].fortifyFactor;
-                damagePercent = roomStates[se.id()].damagePercent();
+                damagePercent = roomStates[se.id].damagePercent;
             }
 
             BuildingViewer::TreeItem itemRoom(se, fortifyFactor, damagePercent);
@@ -179,13 +181,13 @@ bool BuildingEditModel::init(int32_t mseId)
             try
             {
 
-                int32_t floorID = se.path()[1];
+                int32_t floorID = se.path[1];
                 itemRoom.setSuperior(lookupFloorId2TreeId[floorID]);
             }
             catch (const std::out_of_range& e)
             {
                 WARNING_LOG(m_logger) << "Caught exception while trying to get superior id for building " << rootName
-                                      << " with room with mounting point id: " << se.mountingPointId() << ": "
+                                      << " with room with mounting point id: " << se.mountingPointId << ": "
                                       << e.what();
                 return false;
             }

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_thread_video_exporter.cpp

@@ -1,6 +1,7 @@
 
 
 #include "bdv_thread_video_exporter.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "bdv_replay_handler.h"
 
@@ -11,7 +12,9 @@
 
 namespace BuildingViewer
 {
-VideoExporter::VideoExporter(QObject* parent) : QObject(parent)
+VideoExporter::VideoExporter(QObject* parent)
+    : QObject(parent),
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.VideoExporter"))
 {
     DEBUG_LOG(m_logger) << "ThreadVideoExporter has been created";
 }

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_topic_replay_interface.cpp

@@ -1,6 +1,7 @@
 
 
 #include "bdv_topic_replay_interface.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "bdv_replay_handler.h"
 #include "bdv_thread_video_exporter.h"
@@ -26,7 +27,8 @@ namespace BuildingViewer
 {
 
 TopicReplayInterface::TopicReplayInterface(BgViewerController* bgvController, LtsSession::LtsSession* session)
-    : m_bgvController(bgvController), m_session(session)
+    : m_bgvController(bgvController), m_session(session),
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.TopicReplayInterface"))
 {
     session->getForeignGuiInterface<SituationReplay::ForeignGuiInterface>(m_replayIfc);
 }
@@ -240,20 +242,20 @@ bool TopicReplayInterface::exportBuildings(const QVector<int>& buildingIds) cons
     for (const int buildingId : buildingIds)
     {
         const auto mse = ismDtc->mainStructureElement(buildingId);
-        if (mse.id() != buildingId)
+        if (mse.id != buildingId)
         {
             WARNING_LOG(m_logger) << "Could not find MainStructureElement for building with id " << buildingId
                                   << " - skipping";
             continue;
         }
-        const QString fnIve = QString::fromStdString(mse.name()) + QStringLiteral(".flt.ive");
+        const QString fnIve = QString::fromStdString(mse.name) + QStringLiteral(".flt.ive");
-        const QString fnXml = QString::fromStdString(mse.name()) + QStringLiteral(".flt.xml");
+        const QString fnXml = QString::fromStdString(mse.name) + QStringLiteral(".flt.xml");
         if (!copyFile(fnIve, modelPath, outputPath) || !copyFile(fnXml, modelPath, outputPath))
             return false;
-        bi.name = QString::fromStdString(mse.name());
+        bi.name = QString::fromStdString(mse.name);
-        bi.position = LtsUtils::QPoint3D(mse.geoPosition().lon(), mse.geoPosition().lat(), mse.geoPosition().z());
+        bi.position = LtsUtils::QPoint3D(mse.geoPosition.lon, mse.geoPosition.lat, mse.geoPosition.z);
-        bi.angleDegree = mse.angle();
+        bi.angleDegree = mse.angle;
-        bi.id = mse.id();
+        bi.id = mse.id;
 
         knownBuildings += bi;
     }

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_dialog.cpp

@@ -2,6 +2,7 @@
 
 
 #include "bdv_viewer_data_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_bdv_viewer_data_dialog.h"
 
 #include <LtsSession/lts_session_data.h>
@@ -12,6 +13,7 @@ namespace BuildingViewer
 BgViewerDataViewDialog::BgViewerDataViewDialog(QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
   , m_ui(new Ui::BgViewerDataViewDialog)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BgViewerDataViewDialog"))
 {
   m_ui->setupUi(this);
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.cpp

@@ -2,6 +2,7 @@
 
 
 #include "bdv_viewer_data_view.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_bdv_viewer_data_view.h"
 #include "bdv_viewer_data_model.h"
 
@@ -15,6 +16,7 @@ BgViewerDataView::BgViewerDataView(QWidget *parent)
   : QWidget(parent)
   , m_ui(new Ui::BgViewerDataView)
   , m_pModel(new BgViewerDataViewModel(this))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("BuildingViewer.BgViewerDataView"))
 {
   m_ui->setupUi(this);
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/cod_assign_codification_data_table.cpp

@@ -64,20 +64,20 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
     for (const ParticipantManagement::Party& party : std::as_const(userVisibleParties))
     {
 
-        if (party.id() != 2 && party.id() != 3)
+        if (party.id != 2 && party.id != 3)
             continue;
 
         QString partyName;
-        if (party.id() == 2)
+        if (party.id == 2)
             partyName = tr("OPFOR:");
-        else if (party.id() == 3)
+        else if (party.id == 3)
             partyName = tr("BLUFOR:");
         else
-            partyName = ParticipantManagement::trPartyName(party.name());
+            partyName = ParticipantManagement::trPartyName(party.name);
         m_ui->partyLayout->addWidget(new QLabel(partyName, this), i, 0, 1, 1);
 
         LtsWidgets::LtsComboBox* cb = new LtsWidgets::LtsComboBox(this);
-        cb->setProperty(QLatin1String("partyId").data(), party.id());
+        cb->setProperty(QLatin1String("partyId").data(), party.id);
         m_tableVec.append(cb);
         cb->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
         cb->addItem(QStringLiteral("---"), 0);
@@ -88,7 +88,7 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
                         m_model->data(m_model->index(row, CodificationDataOverviewModel::Id), Qt::DisplayRole));
 
             DEBUG_LOG(m_logger)
-                << "Init Combobox[" << row << "]: PartyId: " << party.id() << " Identifier: "
+                << "Init Combobox[" << row << "]: PartyId: " << party.id << " Identifier: "
                 << m_model->data(m_model->index(row, CodificationDataOverviewModel::Identifier), Qt::DisplayRole)
                        .toString()
                 << " CodTabId: "
@@ -105,7 +105,7 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
                     .toInt();
             DEBUG_LOG(m_logger) << "Assignment[" << row << "]:  assignedPartyId: " << assignedPartyId;
 
-            if (party.id() == assignedPartyId)
+            if (party.id == assignedPartyId)
             {
                 tableId =
                     m_model->data(m_model->index(row, CodificationDataOverviewModel::Id), Qt::DisplayRole).toInt();

qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Shared/ism_mounting_point.cpp

@@ -121,12 +121,12 @@ void MountingPoint::init() {
 }
 
 QString MountingPoint::name() const {
-    // codegen exposes 'name' as public member
+    // Qt6: legacy codegen exposed name() as a method; new codegen exposes 'name' as a public member.
     return QString::fromStdString(m_data.name);
 }
 
 QString MountingPoint::fileName() const {
-    // codegen exposes 'name' as public member
+    // Qt6: legacy codegen exposed name() as a method; new codegen exposes 'name' as a public member.
     return QString::fromStdString(m_data.name);
 }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.cpp

@@ -84,17 +84,17 @@ void DetailedChartModel::onDynamicParticipantDataChanged(const ParticipantManage
 {
   Q_UNUSED(modType);
 
-  const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory());
+  const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory);
 
-  if (!m_config.participantIds.contains(data.participantId()) ||
+  if (!m_config.participantIds.contains(data.participantId) ||
-      stateInfo.vulnerabilityState() > ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
+      stateInfo.vulnerabilityState > ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
     return;
 
   
   for (auto it = m_participantStates.begin(); it != m_participantStates.end(); ++it)
-    it.value() -= data.participantId();
+    it.value() -= data.participantId;
 
-  m_participantStates[stateInfo.vulnerabilityState()] += data.participantId();
+  m_participantStates[stateInfo.vulnerabilityState] += data.participantId;
 
   emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
 }
@@ -113,7 +113,7 @@ DetailedChartModel::DetailedChartModel(const AbstractChartModel::ChartConfig &co
 
   auto cb = [this](const ParticipantManagement::DynamicParticipantData & data)
   {
-    if (!m_config.participantIds.contains(data.participantId()))
+    if (!m_config.participantIds.contains(data.participantId))
       return;
     onDynamicParticipantDataChanged(data, DataModification::eAdded);
   };

qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.cpp

@@ -56,18 +56,18 @@ void SimpleChartModel::onDynamicParticipantDataChanged(const ParticipantManageme
 {
   Q_UNUSED(modType);
 
-  if (!m_config.participantIds.contains(data.participantId()))
+  if (!m_config.participantIds.contains(data.participantId))
     return;
 
-  const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory());
+  const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory);
 
-  DEBUG_LOG(m_logger) << "Participant id = " << data.participantId();
+  DEBUG_LOG(m_logger) << "Participant id = " << data.participantId;
-  DEBUG_LOG(m_logger) << "State Info Vulnerability = " << stateInfo.vulnerabilityState();
+  DEBUG_LOG(m_logger) << "State Info Vulnerability = " << static_cast<int>(stateInfo.vulnerabilityState);
 
-  if (stateInfo.vulnerabilityState() < ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
+  if (stateInfo.vulnerabilityState < ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
-    setCombatReady(data.participantId());
+    setCombatReady(data.participantId);
   else
-    setKilled(data.participantId());
+    setKilled(data.participantId);
 
   emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
 }
@@ -76,7 +76,7 @@ SimpleChartModel::SimpleChartModel(const AbstractChartModel::ChartConfig &config
   , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
   auto cb = [this](const ParticipantManagement::DynamicParticipantData & data)
   {
-    if (!m_config.participantIds.contains(data.participantId()))
+    if (!m_config.participantIds.contains(data.participantId))
       return;
     onDynamicParticipantDataChanged(data, DataModification::eAdded);
   };

qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_create_report_dialog.cpp

@@ -160,10 +160,10 @@ bool CreateReportDialog::apply()
   {
     ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(index);
 
-    if (data.id() != 0 &&
+    if (data.id != 0 &&
-        data.equipmentNumber().has_value() &&
+        data.equipmentNumber.has_value() &&
-        typeIds.contains(data.typeId()))
+        typeIds.contains(data.typeId))
-      participantIds.insert(data.id());
+      participantIds.insert(data.id);
   }
   
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_report_dialog.cpp

@@ -54,7 +54,7 @@ ReportDialog::ReportDialog(const AbstractChartModel::ChartConfig &config, QWidge
     for (int32_t participantId :config.participantIds)
     {
       ParticipantManagement::Participant participant = config.ppmDtc->participant(participantId);
-      ParticipantManagement::TypeClass typeClass     = config.ppmDtc->type(participant.typeId()).typeClass();
+      ParticipantManagement::TypeClass typeClass     = config.ppmDtc->type(participant.typeId).typeClass;
 
       participantIdsByTypeClass[typeClass] += participantId;
     }

qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/ore_type_model.cpp

@@ -22,7 +22,7 @@ bool TypeModel::init()
 {
   m_ppmDtc->types([this](const ParticipantManagement::Type &type)
   {
-    if (m_ppmDtc->isTypeInUse(type.id()))
+    if (m_ppmDtc->isTypeInUse(type.id))
       insertRow(type);
   });
 
@@ -33,7 +33,7 @@ int TypeModel::getTypeId(const QModelIndex &index) const
 {
   if (!indexIsValid(index))
     return -1;
-  return m_vecData.at(index.row()).id();
+  return m_vecData.at(index.row()).id;
 }
 
 QVariant TypeModel::data(const QModelIndex &index, int role) const
@@ -46,9 +46,9 @@ QVariant TypeModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case 0:
-    return ParticipantManagement::toString(entry.typeClass());
+    return ParticipantManagement::toString(entry.typeClass);
   case 1:
-    return QString::fromStdString(entry.name());
+    return QString::fromStdString(entry.name);
   }
   return QVariant();
 }
@@ -56,8 +56,8 @@ QVariant TypeModel::data(const QModelIndex &index, int role) const
 bool TypeModel::isFiltered(const ParticipantManagement::Type &data, DataModification modType) const
 {
   Q_UNUSED(modType);
-  return (data.typeClass() == ParticipantManagement::TypeClass::Unit ||
+  return (data.typeClass == ParticipantManagement::TypeClass::Unit ||
-          data.typeClass() == ParticipantManagement::TypeClass::SupportUnit);
+          data.typeClass == ParticipantManagement::TypeClass::SupportUnit);
 }
 
 } 

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

@@ -91,7 +91,10 @@ ADD_INTERFACE_LIBRARY(PpmDataPluginInterface
   svcPpmCommon
 )
 
-IF(Qt5WebEngineWidgets_VERSION VERSION_GREATER 5.7.9)
+# Qt6 Migration: legacy guarded on Qt5WebEngineWidgets_VERSION > 5.7.9; the
+# Qt6 equivalent is that the Qt6::WebEngineWidgets target exists (consumer
+# plugins are additionally gated by BUILD_PLUGINS_PARTICIPANT_ORG_CHART).
+IF(TARGET Qt6::WebEngineWidgets)
 #
 # Combat Power Gui Plugin Interface
 #

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/CMakeLists.txt

@@ -6,7 +6,7 @@
 #
 
 ADD_SUBDIRECTORY(Common)
-# MSDL requires XmlPatterns - skip for Qt6 migration baseline
+# MSDL re-implemented without Qt XmlPatterns (Qt6::Xml + XercesC/xsdc++ + xmllint)
 IF(BUILD_PLUGINS_MSDL)
   ADD_SUBDIRECTORY(MSDL)
 ENDIF()
@@ -21,7 +21,7 @@ ADD_SUBDIRECTORY(ParticipantSelection)
 ADD_SUBDIRECTORY(ParticipantTemplates)
 ADD_SUBDIRECTORY(PartyEdit)
 ADD_SUBDIRECTORY(PpmComboBox)
-# Saab requires XmlPatterns - skip for Qt6 migration baseline
+# Saab re-implemented without Qt XmlPatterns (Qt6::Xml only)
 IF(BUILD_PLUGINS_SAAB)
   ADD_SUBDIRECTORY(Saab)
 ENDIF()

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/CMakeLists.txt

@@ -79,6 +79,9 @@ INSTALL_SHARED_FILES(zwmsmsdl_SRCS
   WS
 )
 
+# .ui files live in the ui/ subdirectory; tell AUTOUIC where to find them
+set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
+
 NGL_WRAP_UI(zwmsmsdl_SRCS ${zwmsmsdl_UICS})
 NGL_ADD_LIBRARY2(WS zwmsmsdl SHARED ${zwmsmsdl_SRCS} ${zwmsmsdl_UICS} ${zwmsmsdl_IDLS})
 NGL_TARGET_INCLUDE_DIRECTORIES(zwmsmsdl
@@ -93,7 +96,6 @@ if(QT6_GUI_AVAILABLE)
     PRIVATE
       ${Qt6_Gui}
       Qt6::Xml
-      Qt6::XmlPatterns
       XercesC::XercesC
     PUBLIC
       svcPpmCommon

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.cpp

@@ -184,7 +184,7 @@ msdl_1::MilitaryScenarioType::ForceSides_type Private::createTagForceSides(const
   for (const ParticipantManagement::Party &party : mapForces)
   {
     
-    if (party.id() == 0 || party.id() == 1)
+    if (party.id == 0 || party.id == 1)
       continue;
 
     QString obHaStr = QUuid::createUuid().toString();
@@ -202,7 +202,7 @@ msdl_1::MilitaryScenarioType::ForceSides_type Private::createTagForceSides(const
     const ParticipantManagement::Party &party = itForce.value();
 
     msdl_1::ForceSideType::ObjectHandle_type obHaTy(strUUID.toStdString().c_str());
-    msdl_1::ForceSideType::ForceSideName_type foSiNaTy(party.name().c_str());
+    msdl_1::ForceSideType::ForceSideName_type foSiNaTy(party.name.c_str());
     msdl_1::ForceSideType foSiTy(obHaTy, foSiNaTy);
 
 
@@ -218,7 +218,7 @@ msdl_1::MilitaryScenarioType::ForceSides_type Private::createTagForceSides(const
 
       
 
-      ParticipantManagement::Role role = itRelationship.value().role();
+      ParticipantManagement::Role role = itRelationship.value().role;
 
       msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type relType = msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type::UNK;
       if (role == ParticipantManagement::Role::Enemy)
@@ -238,7 +238,7 @@ msdl_1::MilitaryScenarioType::ForceSides_type Private::createTagForceSides(const
 
     foSiTy.Associations(asType);
     foSiSe.push_back(foSiTy);
-    mapForceHandles[party.id()] = strUUID;
+    mapForceHandles[party.id] = strUUID;
   }
 
   return foType;
@@ -315,7 +315,7 @@ msdl_1::MilitaryScenarioType::Organizations_type::Units_type Private::createTagU
     QString obHaStr = QUuid::createUuid().toString();
     obHaStr = obHaStr.mid(1, obHaStr.size() - 2);
 
-    mapParticipantsUUIDs[participant.id()] = obHaStr.toStdString();
+    mapParticipantsUUIDs[participant.id] = obHaStr.toStdString();
   }
 
   unitsType unitsTy;
@@ -326,16 +326,16 @@ msdl_1::MilitaryScenarioType::Organizations_type::Units_type Private::createTagU
     for (const ParticipantManagement::Participant &participant : mapParticipants)
     {
       
-      if (participant.partyId() != it.key())
+      if (participant.partyId != it.key())
         continue;
 
-      if (participant.isDeleted())
+      if (participant.isDeleted)
         continue;
 
       forceRelationDataType foReDaTy;
       forceRelationChoiceType foReChTy = forceRelationChoiceType::FORCE_SIDE;
 
-      if (participant.superiorId() == 0) 
+      if (participant.superiorId == 0) 
       {
         foReChTy = forceRelationChoiceType::FORCE_SIDE;
 
@@ -346,12 +346,12 @@ msdl_1::MilitaryScenarioType::Organizations_type::Units_type Private::createTagU
       {
         foReChTy = forceRelationChoiceType::UNIT;
 
-        msdl_1::CommandRelationType::CommandingSuperiorHandle_type handle(mapParticipantsUUIDs.value(participant.superiorId()));
+        msdl_1::CommandRelationType::CommandingSuperiorHandle_type handle(mapParticipantsUUIDs.value(participant.superiorId));
         forceRelationDataType::CommandRelation_type cmdRelation(handle, msdl_1::CommandRelationType::CommandRelationshipType_type::TACON); 
         foReDaTy.CommandRelation(cmdRelation);
       }
 
-      unitType::ObjectHandle_type unObHaTy(mapParticipantsUUIDs.value(participant.id()));
+      unitType::ObjectHandle_type unObHaTy(mapParticipantsUUIDs.value(participant.id));
       unitType::SymbolIdentifier_type syIdTy = "S--------------";
 
       relationsType::ForceRelation_type foReTy(foReChTy, foReDaTy);
@@ -360,7 +360,7 @@ msdl_1::MilitaryScenarioType::Organizations_type::Units_type Private::createTagU
       unitType unitTy(unObHaTy, syIdTy, reTy);
       unitTy.SymbolIdentifier(syIdTy);
 
-      unitType::Name_type naTy(participant.designator().c_str());
+      unitType::Name_type naTy(participant.designator.c_str());
       unitTy.Name(naTy);
 
       unSe.push_back(unitTy);
@@ -389,16 +389,16 @@ msdl_1::MilitaryScenarioType::Organizations_type::Equipment_type Private::create
     for (const ParticipantManagement::Participant &participant : mapParticipants)
     {
       
-      if (participant.partyId() != partyId)
+      if (participant.partyId != partyId)
         continue;
 
-      if (participant.isDeleted())
+      if (participant.isDeleted)
         continue;
 
       
 
       ownerDataType::UnitOwnerHandle_type foOwHaTy;
-      foOwHaTy = mapParticipantsUUIDs.value(participant.id()).c_str();
+      foOwHaTy = mapParticipantsUUIDs.value(participant.id).c_str();
 
       ownerDataType owDaTy;
       owDaTy.UnitOwnerHandle(foOwHaTy);
@@ -409,11 +409,11 @@ msdl_1::MilitaryScenarioType::Organizations_type::Equipment_type Private::create
 
 
       
-      auto vecDISEntities = mapTypes.value(participant.typeId()).disEntities();
+      auto vecDISEntities = mapTypes.value(participant.typeId).disEntities;
       if (!vecDISEntities.size())
       {
-        WARNING_LOG(logger) << "Participant id " << participant.id()
+        WARNING_LOG(logger) << "Participant id " << participant.id
-                            << " belongs to a type id " << participant.typeId() << " which has no DIS id! Skipping export of participant!";
+                            << " belongs to a type id " << participant.typeId << " which has no DIS id! Skipping export of participant!";
         continue;
       }
 
@@ -425,9 +425,9 @@ msdl_1::MilitaryScenarioType::Organizations_type::Equipment_type Private::create
 
       
       
-      coordDataType::GCC_type::X_type x(mapParticipantPositions[participant.id()].pos().lon());
+      coordDataType::GCC_type::X_type x(mapParticipantPositions[participant.id].pos.lon);
-      coordDataType::GCC_type::X_type y(mapParticipantPositions[participant.id()].pos().lat());
+      coordDataType::GCC_type::X_type y(mapParticipantPositions[participant.id].pos.lat);
-      coordDataType::GCC_type::Z_type z(mapParticipantPositions[participant.id()].pos().z());
+      coordDataType::GCC_type::Z_type z(mapParticipantPositions[participant.id].pos.z);
 
       coordDataType::GCC_type utTy(x, y, z);
       coordDataType coDaTy;
@@ -459,7 +459,7 @@ msdl_1::MilitaryScenarioType::Organizations_type::Equipment_type Private::create
       eqItTy.ObjectHandle(eqObHaTy);
 
       
-      equipItemType::Name_type naTy(mapEquipment.value(mapTypes.value(participant.typeId()).equipmentTypeId()).name());
+      equipItemType::Name_type naTy(mapEquipment.value(mapTypes.value(participant.typeId).equipmentTypeId).name);
       eqItTy.Name(naTy);
 
       eqItTy.SymbolIdentifier(syIdTy);

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export_scenario_data.cpp

@@ -22,21 +22,21 @@ ScenarioDataDialog::ScenarioDataDialog(QWidget *parent,
   connect(mUi->m_pushButton_Cancel, &QPushButton::clicked, this, &ScenarioDataDialog::onButtonCancel);
 
   ExerciseManagement::Exercise exercise = exmDtc->exercise(pSession->exerciseId());
-  mUi->m_lineEdit_ExerciseDescription->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseDescription"), QString::fromStdString(exercise.description())).toString());
+  mUi->m_lineEdit_ExerciseDescription->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseDescription"), QString::fromStdString(exercise.description)).toString());
 
   
-  QString strName(QString::fromStdString(exercise.name()));
+  QString strName(QString::fromStdString(exercise.name));
   strName.remove(QLatin1Char(' '));
 
   mUi->m_lineEdit_ExerciseName->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseName"), strName).toString());
-  mUi->m_lineEdit_Domain->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseDomain"), QString::fromStdString(exercise.partitionName())).toString());
+  mUi->m_lineEdit_Domain->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseDomain"), QString::fromStdString(exercise.partitionName)).toString());
   mUi->m_lineEdit_Version->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exerciseVersion"), QString()).toString());
   mUi->m_lineEdit_Purpose->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("exercisePurpose"), QString()).toString());
 
   OperatorManagement::User user = opmDtc->user(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
 
-  mUi->m_lineEdit_Type->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocType"), QString::fromStdString(user.description())).toString());
+  mUi->m_lineEdit_Type->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocType"), QString::fromStdString(user.description)).toString());
-  mUi->m_lineEdit_AuthorName->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocAuthor"), QString::fromStdString(user.name())).toString());
+  mUi->m_lineEdit_AuthorName->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocAuthor"), QString::fromStdString(user.name)).toString());
   mUi->m_lineEdit_Organization->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocOrganization"), QString()).toString());
   mUi->m_lineEdit_Email->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocEmail"), QString()).toString());
   mUi->m_lineEdit_Telephone->setText(LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("MSDL"), QStringLiteral("pocTelephone"), QString()).toString());

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import.cpp

@@ -17,12 +17,9 @@
 #include <QtCore/QUuid>
 #include <QtCore/QTextStream>
 #include <QtCore/QUrl>
-#include <QAbstractMessageHandler>
 #include <QtXml/QDomDocument>
 #include <QMimeData>
 #include <QtCore/QProcess>
-#include <QtXmlPatterns/QXmlSchema>
-#include <QtXmlPatterns/QXmlSchemaValidator>
 
 #include <ngltools/ngltools_filesystem.h>
 #include <Common/participant_dis_helper.h>
@@ -89,17 +86,17 @@ ImportMsdl::ImportMsdl(ParticipantManagement::ParticipantEditModel *pModel, cons
 
     for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
     {
-      for (const auto &disId : type.disEntities())
+      for (const auto &disId : type.disEntities)
       {
         QString strMSDL_DISId = ParticipantManagement::DIS::convertDISTypeInteger2MSDLString(disId);
 
         if (m_mapMSDL_DIS_2TypeId.find(strMSDL_DISId) != m_mapMSDL_DIS_2TypeId.end())
         {
-          WARNING_LOG(mLogger) << "DIS id \"" << strMSDL_DISId << "\" which is assigned to type id \"" << type.id() << "\" is already assigned to type id \"" << m_mapMSDL_DIS_2TypeId[strMSDL_DISId] << "\"";
+          WARNING_LOG(mLogger) << "DIS id \"" << strMSDL_DISId << "\" which is assigned to type id \"" << type.id << "\" is already assigned to type id \"" << m_mapMSDL_DIS_2TypeId[strMSDL_DISId] << "\"";
           continue;
         }
 
-        m_mapMSDL_DIS_2TypeId[strMSDL_DISId]  = type.id();
+        m_mapMSDL_DIS_2TypeId[strMSDL_DISId]  = type.id;
       }
     }
   }
@@ -286,13 +283,14 @@ bool ImportMsdl::schemaValidation()
     return false;
   }
 
-  QXmlSchema schema;
+  // Qt6: Qt XmlPatterns (QXmlSchema) was removed. Check the schema file is
-  msdl::SchemaMessageHandler smh;
+  // well-formed XML via Qt6::Xml (QDomDocument); the external xmllint step below
-  schema.setMessageHandler(&smh);
+  // performs the full schema/instance validation.
-  schema.load(&schemaFile, QUrl::fromLocalFile(schemaFile.fileName()));
+  QDomDocument schemaDoc;
+  schemaDoc.setContent(&schemaFile, false);
 
   
-  if (!schema.isValid())
+  if (schemaDoc.documentElement().isNull())
   {
     LtsWidgets::LtsMessageDialog::showMessage(this, tr("Schema is invalid"));
     return false;
@@ -322,16 +320,6 @@ bool ImportMsdl::schemaValidation()
 #endif
 
   
-  QXmlSchemaValidator validator(schema);
-
-  if (false )
-  {
-#ifdef LTS_DEBUG
-    LtsWidgets::LtsMessageDialog::showMessage(this, tr("Instance document is invalid"));
-#endif
-    return false;
-  }
-
   return true;
 }
 
@@ -341,17 +329,14 @@ ParticipantManagement::ParticipantData ImportMsdl::createParticipant(const MSDLP
   ParticipantManagement::ParticipantData p;
 
   
-  p.designator(unit.m_designator.toStdString());
+  p.designator = unit.m_designator.toStdString();
-  p.tacticalIdentifier(unit.m_tacticalIdentifier.toStdString());
+  p.tacticalIdentifier = unit.m_tacticalIdentifier.toStdString();
 
-  
+  p.equipmentNumber = 0;
-  p.equipmentNumber() = 0;
+  p.assignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
-  p.assignState() = ParticipantManagement::ParticipantAssignState::HandoutExcon;
 
-  
+  p.symbol = m_mapTypes[unit.m_mappedTypeId].symbol;
-
+  p.typeId = unit.m_mappedTypeId;
-  p.symbol(m_mapTypes[unit.m_mappedTypeId].symbol());
-  p.typeId(unit.m_mappedTypeId); 
 
   return p;
 }
@@ -370,7 +355,7 @@ void ImportMsdl::insertParty(const MSDLParty &party)
 {
   
   ParticipantManagement::ParticipantData newParty;
-  newParty.designator(party.m_forceSideName.toStdString());
+  newParty.designator = party.m_forceSideName.toStdString();
   createNode(newParty, m_indexRoot, party.m_ownHandle);
 }
 
@@ -753,7 +738,7 @@ void ImportMsdl::mapParticipant2Type(MSDLParticipant &participant, qint32 mapped
   {
     m_mapMSDL_DIS_2TypeId[participant.m_DISTypeMSDL] = mappedTypeId;
 
-    m_mapTypes[mappedTypeId].disEntities().push_back(ParticipantManagement::DIS::convertMSDLString2Integer(participant.m_DISTypeMSDL));
+    m_mapTypes[mappedTypeId].disEntities.push_back(ParticipantManagement::DIS::convertMSDLString2Integer(participant.m_DISTypeMSDL));
     m_setTouchedTypes.insert(mappedTypeId);
   }
 }

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import_show.cpp

@@ -182,18 +182,3 @@ void ImportMsdlShow::slotCustomContextMenuActionTriggered(QAction *ac)
 }
 
 
-void SchemaMessageHandler::handleMessage(QtMsgType type,
-                                         const QString &description,
-                                         const QUrl &identifier,
-                                         const QSourceLocation &sourceLocation)
-{
-  ERROR_LOG(mLogger) << "type: " << type << " desc: " << description;
-  if (identifier.isValid())
-    ERROR_LOG(mLogger) << "identifier: " << identifier.toString();
-  if (!sourceLocation.isNull())
-    ERROR_LOG(mLogger) << "sourceLocation: "
-                       << sourceLocation.uri().toString()
-                       << " line: " << sourceLocation.line()
-                       << " column: " << sourceLocation.column()
-                       ;
-}

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_import_show.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QtXml/QDomDocument>
-#include <QtXmlPatterns/QAbstractMessageHandler>
 #include <nglwidgets/ngldialog.h>
 #include "msdl_logging.h"
 
@@ -13,23 +12,6 @@
 
 namespace msdl
 {
-class SchemaMessageHandler : public QAbstractMessageHandler
-{
-  Q_OBJECT
-public:
-  explicit SchemaMessageHandler(QObject *parent = nullptr)
-    : QAbstractMessageHandler(parent)
-    , mLogger(getLogger("SchemaMessageHandler"))
-  {}
-protected:
-  void handleMessage(QtMsgType type,
-                     const QString &description,
-                     const QUrl &identifier = QUrl(),
-                     const QSourceLocation &sourceLocation = QSourceLocation()) override;
-private:
-  LOGGER_T          mLogger;
-};
-
 class ImportMsdlShow : public NGLDialog
 {
   Q_OBJECT

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_mapping_dialog.cpp

@@ -26,13 +26,13 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin
 
   for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
   {
-    if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0))
+    if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities.size() == 0))
     {
-      WARNING_LOG(mLogger) << "Type id " << type.id() << " does not have assigned DIS types! Type cannot be used when importing MSDL data!";
+      WARNING_LOG(mLogger) << "Type id " << type.id << " does not have assigned DIS types! Type cannot be used when importing MSDL data!";
       continue;
     }
 
-    const ParticipantManagement::TypeClass typeClassId = type.typeClass();
+    const ParticipantManagement::TypeClass typeClassId = type.typeClass;
 
     if (typeClassIsUnit)
     {
@@ -49,7 +49,7 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin
   }
 
   for (const auto &typeclass : setTypeClasses)
-    mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), typeclass);
+    mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), static_cast<int>(typeclass));
 
   slotClassTypeChanged();
 
@@ -68,21 +68,21 @@ void MappingDialog::slotClassTypeChanged()
 {
   mUi->m_ltsComboBox_type->clear();
 
-  int currentClass = mUi->m_ltsComboBox_typeClass->currentData().toInt();
+  ParticipantManagement::TypeClass currentClass = static_cast<ParticipantManagement::TypeClass>(mUi->m_ltsComboBox_typeClass->currentData().toInt());
 
   for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
   {
-    if (type.typeClass() != currentClass)
+    if (type.typeClass != currentClass)
       continue;
 
-    if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0))
+    if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities.size() == 0))
     {
       
-      WARNING_LOG(mLogger) << "Type id " << type.id() << " does not have assigned DIS types! Type cannot be used when importing MSDL data!";
+      WARNING_LOG(mLogger) << "Type id " << type.id << " does not have assigned DIS types! Type cannot be used when importing MSDL data!";
       continue;
     }
 
-    mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name()), type.id());
+    mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name), type.id);
   }
 }
 
@@ -122,6 +122,6 @@ bool MappingDialog::autoMapAllUnmappedElements() const
 int32_t MappingDialog::getMappedTypeId() const
 {
   int index = mUi->m_ltsComboBox_type->currentData().toInt();
-  return m_mapTypes[index].id();
+  return m_mapTypes[index].id;
 }
 }

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/ppm_msdl_edit.cpp

@@ -3,7 +3,7 @@
 #include "ppm_msdl_edit.h"
 #include "ui_ppm_msdl_edit.h"
 #include "msdl/msdl_import.h"
-#include "msdl_export.h"
+#include "msdl/msdl_export.h"
 
 #include <QtGui/QAction>
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
@@ -18,6 +18,7 @@ namespace ParticipantManagement
 {
 MSDLEdit::MSDLEdit(LtsSession::LtsSession *session, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
+  , m_logger(getLogger("MSDLEdit"))
   , m_actionRemove(nullptr)
   , m_actionEdit(nullptr)
   , m_ppmDtc(nullptr)

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/CMakeLists.txt

@@ -44,6 +44,9 @@ if(QT6_GUI_AVAILABLE)
       ${Qt6_Widgets}
       Qt6::WebEngineCore
       Qt6::WebEngineWidgets
+      # Qt6 Migration: Qt5::WebEngineWidgets transitively linked Qt5::WebChannel;
+      # Qt6 dropped that dependency, so link the module explicitly.
+      Qt6::WebChannel
       LtsSession
       NGLLogger
     PUBLIC

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.cpp

@@ -2,6 +2,7 @@
 
 #include "participant_org_chart.h"
 #include "ui_participant_org_chart.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QtWebEngineCore/QWebEngineSettings>
 
 #include <Symbology/symbol_data_to_render_role.h>
@@ -16,9 +17,9 @@ namespace ParticipantManagement
 inline bool compareState(const StateInformation &a,
                          const StateInformation &b)
 {
-  if (a.stateTime() != b.stateTime())
+  if (a.stateTime != b.stateTime)
-    return a.stateTime() < b.stateTime();
+    return a.stateTime < b.stateTime;
-  return a.vulnerabilityState() < b.vulnerabilityState();
+  return a.vulnerabilityState < b.vulnerabilityState;
 }
 
 LtsParticipantsOrgChart::LtsParticipantsOrgChart(QWidget *parent)
@@ -32,6 +33,7 @@ LtsParticipantsOrgChart::LtsParticipantsOrgChart(QWidget *parent)
   , m_dtc(nullptr)
   , m_asbItc(nullptr)
   , m_ui(new Ui::LtsParticipantsOrgChart)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
 }
@@ -137,16 +139,16 @@ void LtsParticipantsOrgChart::loadParty(int partyId)
   
   for (const ParticipantManagement::Participant &part : participantMap)
   {
-    if (part.isDeleted() || part.partyId() != m_partyId)
+    if (part.isDeleted || part.partyId != m_partyId)
       continue;
-    if (part.superiorId() == 0)
+    if (part.superiorId == 0)
     {
       root = part;
       break;
     }
   }
 
-  if (root.inferiorIds().size() == 0)
+  if (root.inferiorIds.size() == 0)
   {
     m_dataSource = preDefThing;
     m_ui->wevOrgChart->reload();
@@ -166,10 +168,10 @@ void LtsParticipantsOrgChart::loadParty(int partyId)
   connect(m_participantOrgChart_MimeDataHelper.data(), &ParticipantOrgChart_MimeDataHelper::finished,
           this, &LtsParticipantsOrgChart::onParticipantOrgChart_MimeDataHelperFinished);
 
-  m_participantOrgChart_MimeDataHelper->run(root.id(),
+  m_participantOrgChart_MimeDataHelper->run(root.id,
                                             false,
-                                            AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role()),
+                                            AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role),
-                                            QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color())),
+                                            QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color)),
                                             m_useSymData);
 }
 
@@ -231,10 +233,10 @@ bool LtsParticipantsOrgChart::loadTemplate(int templateRootId)
   connect(m_participantOrgChart_MimeDataHelper.data(), &ParticipantOrgChart_MimeDataHelper::finished,
           this, &LtsParticipantsOrgChart::onParticipantOrgChart_MimeDataHelperFinished);
 
-  m_participantOrgChart_MimeDataHelper->run(root.templateId(),
+  m_participantOrgChart_MimeDataHelper->run(root.templateId,
                                             false,
-                                            AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role()),
+                                            AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role),
-                                            QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color())),
+                                            QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color)),
                                             false);
 
   return true;
@@ -258,8 +260,8 @@ void LtsParticipantsOrgChart::updateParticipant(int participantId)
 
   helper->run(participantId,
               true,
-              AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role()),
+              AdvancedSymbology::roleToRole<>(m_dtc->party(m_partyId).role),
-              QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color())),
+              QColor::fromRgb(QRgb(m_dtc->party(m_partyId).color)),
               m_useSymData);
 }
 
@@ -301,8 +303,7 @@ void LtsParticipantsOrgChart::getWholeHierarchy()
 WebNofitifier::WebNofitifier(QObject *parent) : QObject(parent)
   , m_currentJsonString(QString())
   , m_updateString(QString())
-  , m_updateTimer(new QTimer(this)),
+  , m_updateTimer(new QTimer(this)) {
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
   connect(m_updateTimer, &QTimer::timeout, this, &WebNofitifier::onTimerTick);
 }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart.h

@@ -97,7 +97,6 @@ signals:
 
 private:
 
-NGL::INGLLogger &m_logger;
   int m_partyId;
   bool m_useSymData;
   bool m_isMenuEnabled;
@@ -114,6 +113,8 @@ NGL::INGLLogger &m_logger;
   std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtc;
   std::shared_ptr<AdvancedSymbology::ForeignDataInterface> m_asbItc;
   Ui::LtsParticipantsOrgChart *m_ui;
+
+  NGL::INGLLogger &m_logger;
 };
 
 }

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/ppm_saab_edit.cpp

@@ -3,7 +3,7 @@
 #include "ppm_saab_edit.h"
 #include "ui_ppm_saab_edit.h"
 #include "saab/saab_import.h"
-#include "saab_export.h"
+#include "saab/saab_export.h"
 
 #include <QtGui/QAction>
 #include <AdvancedSymbology/asb_data_plugin_interface.h>
@@ -18,6 +18,7 @@ namespace ParticipantManagement
 {
 SAABEdit::SAABEdit(LtsSession::LtsSession *session, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
+  , m_logger(getLogger("SAABEdit"))
   , m_actionRemove(nullptr)
   , m_actionEdit(nullptr)
   , m_ppmDtc(nullptr)

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/CMakeLists.txt

@@ -43,6 +43,9 @@ SET(zwmssaab_UICS
   ui/saab_mapping_dialog.ui
 )
 
+# .ui files live in the ui/ subdirectory; tell AUTOUIC where to find them
+set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
+
 NGL_WRAP_UI(zwmssaab_SRCS ${zwmssaab_UICS})
 NGL_ADD_LIBRARY2(WS zwmssaab SHARED ${zwmssaab_SRCS} ${zwmssaab_UICS} ${zwmssaab_IDLS})
 NGL_TARGET_INCLUDE_DIRECTORIES(zwmssaab
@@ -55,7 +58,6 @@ if(QT6_GUI_AVAILABLE)
     PRIVATE
       ${Qt6_Gui}
       Qt6::Xml
-      Qt6::XmlPatterns
     PUBLIC
       svcPpmCommon
       LtsUtilsSettings

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_export.cpp

@@ -45,6 +45,7 @@ ExportSaab::ExportSaab(LtsSession::LtsSession *session, const std::shared_ptr<Pa
   , m_session(session)
   , m_configFile(nullptr)
   , m_ui(new Ui_SAABExport)
+  , m_logger(saab::getLogger("ExportSaab"))
 {
   m_ui->setupUi(this);
 
@@ -369,13 +370,13 @@ void ExportSaab::writeExercise(QXmlStreamWriter *writer) const
   using namespace XmlStrings;
 
   writer->writeStartElement(SAAB_EXERCISE());
-  writer->writeAttribute(SAAB_ID(), QUuid(l, m_currentExercise.id(), w2, b1, b2, b3, b4, b5, b6, b7, GuidContext::GuidExercise).toString(QUuid::WithoutBraces));
+  writer->writeAttribute(SAAB_ID(), QUuid(l, m_currentExercise.id, w2, b1, b2, b3, b4, b5, b6, b7, GuidContext::GuidExercise).toString(QUuid::WithoutBraces));
 
   writer->writeTextElement(SAAB_EXPORT_TIME(),  toSaabTime(m_session->partitionTime()));
-  writer->writeTextElement(SAAB_PLANNED_START_TIME(), toSaabTime(m_currentExercise.beginTime()));
+  writer->writeTextElement(SAAB_PLANNED_START_TIME(), toSaabTime(m_currentExercise.beginTime));
-  writer->writeTextElement(SAAB_PLANNED_STOP_TIME(), toSaabTime(m_currentExercise.endTime()));
+  writer->writeTextElement(SAAB_PLANNED_STOP_TIME(), toSaabTime(m_currentExercise.endTime));
-  writer->writeTextElement(SAAB_DESIGNATION(), QString::fromStdString(m_currentExercise.name()));
+  writer->writeTextElement(SAAB_DESIGNATION(), QString::fromStdString(m_currentExercise.name));
-  writer->writeTextElement(SAAB_DESCRIPTION(), QString::fromStdString(m_currentExercise.description()));
+  writer->writeTextElement(SAAB_DESCRIPTION(), QString::fromStdString(m_currentExercise.description));
   writer->writeTextElement(SAAB_WIND_SPEED(), QStringLiteral("0"));
   writer->writeTextElement(SAAB_WIND_DIRECTION(), QStringLiteral("0"));
   writer->writeEmptyElement(SAAB_EVALUATION_PACKAGE_FILE_NAME());
@@ -420,13 +421,13 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Party &party,
 
   result = new SaabUnit;
 
-  result->symbol = m_mapPartyToForce.value(party.id()).symbolCode;
+  result->symbol = m_mapPartyToForce.value(party.id).symbolCode;
-  static_cast<SaabUnit *>(result)->unitSize = m_mapPartyToForce.value(party.id()).echelonCode;
+  static_cast<SaabUnit *>(result)->unitSize = m_mapPartyToForce.value(party.id).echelonCode;
-  result->designation = QString::fromStdString(party.name());
+  result->designation = QString::fromStdString(party.name);
   result->trashcan = false;
   result->isExternalPlayer = true;
-  result->force = m_mapPartyToForce.value(party.id()).forceCode;
+  result->force = m_mapPartyToForce.value(party.id).forceCode;
-  result->guid = QUuid(l, m_currentExercise.id(), w2, static_cast<uchar>(party.id()), b2, b3, b4, b5, b6, b7, GuidContext::GuidParty).toString(QUuid::WithoutBraces);
+  result->guid = QUuid(l, m_currentExercise.id, w2, static_cast<uchar>(party.id), b2, b3, b4, b5, b6, b7, GuidContext::GuidParty).toString(QUuid::WithoutBraces);
 
   QList<int> keys = remainingParticipants.keys();
 
@@ -438,7 +439,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Party &party,
 
     ParticipantManagement::Participant participant = remainingParticipants.value(key);
 
-    if (!(participant.partyId() == party.id() && participant.superiorId() == 0))
+    if (!(participant.partyId == party.id && participant.superiorId == 0))
       continue;
 
     SaabPlayer *player = toSaabPlayer(participant, remainingParticipants);
@@ -454,26 +455,26 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Party &party,
 
 SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &participant, QMap<int, ParticipantManagement::Participant> &remainingParticipants)
 {
-  if (participant.isDeleted())
+  if (participant.isDeleted)
   {
-    DEBUG_LOG(m_logger) << "Participant with id " << participant.id() << " id deleted --> skipping";
+    DEBUG_LOG(m_logger) << "Participant with id " << participant.id << " id deleted --> skipping";
     return nullptr;
   }
 
-  if (participant.externalId())
+  if (participant.externalId)
   {
-    DEBUG_LOG(m_logger) << "Particpant with id " << participant.id() << " has external ID set to " << participant.externalId() << " --> not being exported.";
+    DEBUG_LOG(m_logger) << "Particpant with id " << participant.id << " has external ID set to " << participant.externalId << " --> not being exported.";
     return nullptr;
   }
 
   SaabPlayer *result;
 
-  ParticipantManagement::Type type = m_types.value(participant.typeId());
+  ParticipantManagement::Type type = m_types.value(participant.typeId);
 
-  if (!m_mapTypeToSaabSymbol.contains(type.id()))
+  if (!m_mapTypeToSaabSymbol.contains(type.id))
     mapType(type);
 
-  switch (type.typeClass())
+  switch (type.typeClass)
   {
   case ParticipantManagement::TypeClass::SupportEntity: 
     result = new SaabOcPlayer;
@@ -491,9 +492,9 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
   {
     result = new SaabUnit;
 
-    DEBUG_LOG(m_logger) << "Reading unit with " << participant.inferiorIds().size() << " inferiors";
+    DEBUG_LOG(m_logger) << "Reading unit with " << participant.inferiorIds.size() << " inferiors";
 
-    for (int32_t id : participant.inferiorIds())
+    for (int32_t id : participant.inferiorIds)
     {
       SaabPlayer *player = toSaabPlayer(remainingParticipants.value(id), remainingParticipants);
 
@@ -509,7 +510,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
     
     if (!static_cast<SaabUnit *>(result)->inferiors.size())
     {
-      DEBUG_LOG(m_logger) << "Unit " << participant.id() << " has no inferiors.";
+      DEBUG_LOG(m_logger) << "Unit " << participant.id << " has no inferiors.";
       return nullptr;
     }
 
@@ -519,11 +520,11 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
   case ParticipantManagement::TypeClass::Aircraft:
   case ParticipantManagement::TypeClass::Unknown:
   default:
-    DEBUG_LOG(m_logger) << "Type " << participant.typeId() << " is not supported.";
+    DEBUG_LOG(m_logger) << "Type " << participant.typeId << " is not supported.";
     return nullptr;
   }
 
-  QString symbol = m_mapTypeToSaabSymbol.value(type.id());
+  QString symbol = m_mapTypeToSaabSymbol.value(type.id);
 
   if (typeid(*result) == typeid(SaabUnit))
   {
@@ -535,22 +536,22 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
   else
     result->symbol = symbol;
 
-  result->designation = QString::fromStdString(participant.designator());
+  result->designation = QString::fromStdString(participant.designator);
-  result->trashcan = participant.isDeleted();
+  result->trashcan = participant.isDeleted;
   result->rank = QStringLiteral("OF1");
   result->isExternalPlayer = true;
-  if (participant.equipmentNumber().has_value())
+  if (participant.equipmentNumber.has_value())
-    result->simulatorId = participant.equipmentNumber().get();
+    result->simulatorId = participant.equipmentNumber.get();
-  result->force = m_mapPartyToForce.value(participant.partyId()).forceCode;
+  result->force = m_mapPartyToForce.value(participant.partyId).forceCode;
-  result->guid = QUuid(participant.id(), m_currentExercise.id(), w2, static_cast<uchar>(participant.partyId()), b2, b3, b4, b5, b6, b7, GuidContext::GuidParticipant).toString(QUuid::WithoutBraces);
+  result->guid = QUuid(participant.id, m_currentExercise.id, w2, static_cast<uchar>(participant.partyId), b2, b3, b4, b5, b6, b7, GuidContext::GuidParticipant).toString(QUuid::WithoutBraces);
 
   return result;
 }
 
 ParticipantManagement::Participant ExportSaab::rootParticipant(const ParticipantManagement::Participant &participant, const QMap<int, ParticipantManagement::Participant> &participants) const
 {
-  if (participant.superiorId())
+  if (participant.superiorId)
-    return rootParticipant(participants.value(participant.superiorId()), participants);
+    return rootParticipant(participants.value(participant.superiorId), participants);
   return participant;
 }
 
@@ -563,10 +564,10 @@ void ExportSaab::mapType(const ParticipantManagement::Type &type)
 {
   using namespace ParticipantManagement;
 
-  MapType dialog(ParticipantManagement::trTypeName(type.name()),
+  MapType dialog(ParticipantManagement::trTypeName(type.name),
                  m_mapEchelons,
                  m_mapSymbols,
-                 type.typeClass() == TypeClass::Unit || type.typeClass() == TypeClass::SupportUnit,
+                 type.typeClass == TypeClass::Unit || type.typeClass == TypeClass::SupportUnit,
                  this);
 
   dialog.exec();
@@ -579,19 +580,19 @@ void ExportSaab::mapType(const ParticipantManagement::Type &type)
     saabTypeStr.append(dialog.echelonCode());
   }
 
-  m_mapTypeToSaabSymbol.insert(type.id(), saabTypeStr);
+  m_mapTypeToSaabSymbol.insert(type.id, saabTypeStr);
 }
 
 void ExportSaab::mapPartyToForce(const ParticipantManagement::Party &party)
 {
-  MapParty dialog(QString::fromStdString(party.name()), m_mapForces, m_mapEchelons, m_mapSymbols, this);
+  MapParty dialog(QString::fromStdString(party.name), m_mapForces, m_mapEchelons, m_mapSymbols, this);
 
   dialog.exec();
 
   if (dialog.isSkipped())
     return;
 
-  m_mapPartyToForce.insert(party.id(), { m_mapForces.take(dialog.force()), dialog.echelonCode(), dialog.symbolCode() });
+  m_mapPartyToForce.insert(party.id, { m_mapForces.take(dialog.force()), dialog.echelonCode(), dialog.symbolCode() });
 }
 
 }

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import.cpp

@@ -166,17 +166,16 @@ ParticipantManagement::ParticipantData ImportSaab::createParticipant(SaabPlayer
   
 
   
-  p.tacticalIdentifier(player->designation.toStdString());
+  p.tacticalIdentifier = player->designation.toStdString();
 
-  
+  p.equipmentNumber = (player->simulatorId != INT_MIN ? player->simulatorId : 0);
-  p.equipmentNumber(player->simulatorId != INT_MIN ? player->simulatorId : 0);
+  p.assignState = ParticipantManagement::ParticipantAssignState::HandoutExcon;
-  p.assignState() = ParticipantManagement::ParticipantAssignState::HandoutExcon;
 
   if (player->simulatorId != INT_MIN)
-    p.externalId(player->simulatorId);
+    p.externalId = player->simulatorId;
 
-  p.symbol(m_mapTypes[player->mappedTypeId].symbol());
+  p.symbol = m_mapTypes[player->mappedTypeId].symbol;
-  p.typeId(player->mappedTypeId); 
+  p.typeId = player->mappedTypeId;
 
   return p;
 }
@@ -192,7 +191,7 @@ void ImportSaab::insertParty(SaabUnit *party)
 {
   
   ParticipantManagement::ParticipantData newParty;
-  newParty.designator(party->designation.toStdString());
+  newParty.designator = party->designation.toStdString();
   createNode(newParty, m_indexRoot, party);
 }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import_show.cpp

@@ -182,18 +182,3 @@ void ImportSaabShow::slotCustomContextMenuActionTriggered(QAction *ac)
 }
 
 
-void SchemaMessageHandler::handleMessage(QtMsgType type,
-                                         const QString &description,
-                                         const QUrl &identifier,
-                                         const QSourceLocation &sourceLocation)
-{
-  ERROR_LOG(mLogger) << "type: " << type << " desc: " << description;
-  if (identifier.isValid())
-    ERROR_LOG(mLogger) << "identifier: " << identifier.toString();
-  if (!sourceLocation.isNull())
-    ERROR_LOG(mLogger) << "sourceLocation: "
-                       << sourceLocation.uri().toString()
-                       << " line: " << sourceLocation.line()
-                       << " column: " << sourceLocation.column()
-                       ;
-}

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_import_show.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QtXml/QDomDocument>
-#include <QtXmlPatterns/QAbstractMessageHandler>
 #include <nglwidgets/ngldialog.h>
 #include "saab_logging.h"
 
@@ -13,25 +12,6 @@
 
 namespace saab
 {
-class SchemaMessageHandler : public QAbstractMessageHandler
-{
-  Q_OBJECT
-public:
-  explicit SchemaMessageHandler(QObject *parent = nullptr)
-    : QAbstractMessageHandler(parent)
-    , mLogger(getLogger("SchemaMessageHandler"))
-  {}
-  ~SchemaMessageHandler()
-  {}
-protected:
-  void handleMessage(QtMsgType type,
-                     const QString &description,
-                     const QUrl &identifier = QUrl(),
-                     const QSourceLocation &sourceLocation = QSourceLocation());
-private:
-  LOGGER_T          mLogger;
-};
-
 class ImportSaabShow : public NGLDialog
 {
   Q_OBJECT

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Saab/saab/saab_mapping_dialog.cpp

@@ -26,16 +26,16 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin
 
   for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
   {
-    if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0))
+    if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities.size() == 0))
     {
-      WARNING_LOG(mLogger) << "Type id " << type.id() << " does not have assigned DIS types! Type cannot be used when importing SAAB data!";
+      WARNING_LOG(mLogger) << "Type id " << type.id << " does not have assigned DIS types! Type cannot be used when importing SAAB data!";
       continue;
     }
 
-    if (type.isDeleted())
+    if (type.isDeleted)
       continue;
 
-    const ParticipantManagement::TypeClass typeClassId = type.typeClass();
+    const ParticipantManagement::TypeClass typeClassId = type.typeClass;
 
     if (typeClassId == ParticipantManagement::TypeClass::Unknown ||
         typeClassId == ParticipantManagement::TypeClass::Vessel ||
@@ -57,7 +57,7 @@ MappingDialog::MappingDialog(QWidget *parent, bool typeClassIsUnit, const QStrin
   }
 
   for (const auto &typeclass : setTypeClasses)
-    mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), typeclass);
+    mUi->m_ltsComboBox_typeClass->addItem(ParticipantManagement::toString(typeclass), static_cast<int>(typeclass));
 
   slotClassTypeChanged();
 
@@ -76,24 +76,24 @@ void MappingDialog::slotClassTypeChanged()
 {
   mUi->m_ltsComboBox_type->clear();
 
-  int currentClass = mUi->m_ltsComboBox_typeClass->currentData().toInt();
+  ParticipantManagement::TypeClass currentClass = static_cast<ParticipantManagement::TypeClass>(mUi->m_ltsComboBox_typeClass->currentData().toInt());
 
   for (const ParticipantManagement::Type &type : std::as_const(m_mapTypes))
   {
-    if(type.isDeleted())
+    if(type.isDeleted)
       continue;
 
-    if (type.typeClass() != currentClass)
+    if (type.typeClass != currentClass)
       continue;
 
-    if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities().size() == 0))
+    if (!m_offerDatabaseEntriesWithoutDISType && (type.disEntities.size() == 0))
     {
       
-      WARNING_LOG(mLogger) << "Type id " << type.id() << " does not have assigned DIS types! Type cannot be used when importing SAAB data!";
+      WARNING_LOG(mLogger) << "Type id " << type.id << " does not have assigned DIS types! Type cannot be used when importing SAAB data!";
       continue;
     }
 
-    mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name()), type.id());
+    mUi->m_ltsComboBox_type->addItem(QString::fromStdString(type.name), type.id);
   }
 }
 
@@ -126,6 +126,6 @@ bool MappingDialog::skipAllUnmappedElements() const
 int32_t MappingDialog::getMappedTypeId() const
 {
   int index = mUi->m_ltsComboBox_type->currentData().toInt();
-  return m_mapTypes[index].id();
+  return m_mapTypes[index].id;
 }
 }

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

@@ -75,6 +75,9 @@ if(QT6_GUI_AVAILABLE)
       LtsSessionData
       NGLLogger
       Qt6::Xml
+      # Qt6 Migration: Qt5::WebEngineWidgets transitively linked Qt5::PrintSupport
+      # (plan_editor.cpp includes <QtPrintSupport/QPrintDialog>); Qt6 dropped that.
+      Qt6::PrintSupport
       ngltranslator
   
     PUBLIC

qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/PlanEditorPlugin/Gui/plan_editor_gui_plugin.cpp

@@ -23,7 +23,7 @@
 
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
@@ -475,9 +475,9 @@ bool InterfaceImpl::fmsCreatePlan(bool clearGeometryModel)
 
     FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
 
-    m_internal->m_currentFolderId   = fc.folderId();
+    m_internal->m_currentFolderId   = fc.folderId;
     m_internal->m_currentFileId     = fileId;
-    m_internal->m_currentNameOfPlan = QString::fromStdString(fc.name());
+    m_internal->m_currentNameOfPlan = QString::fromStdString(fc.name);
 
     QFileInfo fileInfo(m_internal->m_currentNameOfPlan);
     m_internal->m_planEditor->setNameOfPlan(fileInfo.baseName());
@@ -511,7 +511,7 @@ bool InterfaceImpl::fmsModifyPlan(int fileId, bool saveAs)
   }
 
   FileManagement::FileContent    fileContent = m_internal->m_flmDtc->fileContent(fileId);
-  bool differentUser = fileContent.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+  bool differentUser = fileContent.operatorId != LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
   if (saveAs || differentUser)
   {
@@ -527,8 +527,8 @@ bool InterfaceImpl::fmsModifyPlan(int fileId, bool saveAs)
   }
 
 
-  QString nameOfPlan  = QString::fromStdString(fileContent.name());
+  QString nameOfPlan  = QString::fromStdString(fileContent.name);
-  m_internal->m_currentFolderId   = fileContent.folderId();
+  m_internal->m_currentFolderId   = fileContent.folderId;
   m_internal->m_currentNameOfPlan = nameOfPlan;
   m_internal->m_currentFileId     = fileId;
 
@@ -592,7 +592,7 @@ void InterfaceImpl::fmsReadPlan()
     m_internal->m_planEditor->onPlanReset(); 
 
     FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
-    QString nameOfPlan  = QString::fromStdString(fc.name());
+    QString nameOfPlan  = QString::fromStdString(fc.name);
 
     if (content.size() == 0)
     {
@@ -606,8 +606,8 @@ void InterfaceImpl::fmsReadPlan()
       m_internal->m_planEditor->setPlan(content);
 
       m_internal->m_currentNameOfPlan = nameOfPlan;
-      m_internal->m_currentFolderId   = fc.folderId();
+      m_internal->m_currentFolderId   = fc.folderId;
-      m_internal->m_currentFileId     = fc.id();
+      m_internal->m_currentFileId     = fc.id;
 
       QFileInfo fileInfo(m_internal->m_currentNameOfPlan);
       m_internal->m_planEditor->setNameOfPlan(fileInfo.baseName());
@@ -650,7 +650,7 @@ void InterfaceImpl::fmsImportPlan()
   if (fileId > 0)
   {
     FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
-    QString nameOfPlan  = QString::fromStdString(fc.name());
+    QString nameOfPlan  = QString::fromStdString(fc.name);
     if (content.size() == 0)
     {
       ERROR_LOG(m_logger) << "Error plan [" << nameOfPlan << "] is empty";
@@ -690,7 +690,7 @@ bool InterfaceImpl::fmsWritePlan(bool saveAs)
     
     FileManagement::FileContent   planFileContent;
     if (m_internal->m_flmDtc->getFile(FileManagement::FileType::TacticalPlan, m_internal->m_currentFolderId, m_internal->m_currentNameOfPlan, planFileContent))
-      m_internal->m_currentFileId = planFileContent.id();
+      m_internal->m_currentFileId = planFileContent.id;
   }
 
   if (saveAs || (m_internal->m_currentFileId <= 0))
@@ -726,7 +726,7 @@ void InterfaceImpl::fmsDeletePlan()
   if (fileId > 0)
   {
     FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
-    QString nameOfPlan  = QString::fromStdString(fc.name());
+    QString nameOfPlan  = QString::fromStdString(fc.name);
 
     LtsWidgets::Button doIt = LtsWidgets::LtsMessageDialog::showMessage(
                                 m_session->baseLayout()
@@ -753,7 +753,7 @@ void InterfaceImpl::fmsDeletePlan()
 
 void InterfaceImpl::onPlanContentChanged(const FileManagement::FileContent &data, DataModification modType)
 {
-  if (data.fileType() != FileManagement::FileType::TacticalPlan)
+  if (data.fileType != FileManagement::FileType::TacticalPlan)
     return;
 
   switch (modType)
@@ -761,7 +761,7 @@ void InterfaceImpl::onPlanContentChanged(const FileManagement::FileContent &data
   case DataModification::eModified :
     break;
   case DataModification::eRemoved  :
-    if (m_internal->m_currentFileId == data.id())
+    if (m_internal->m_currentFileId == data.id)
       m_internal->m_currentFileId = -1;
     break;
 
@@ -780,7 +780,7 @@ void InterfaceImpl::onIterateParticipantsSidc()
 
   auto gatherUpSidc = [&participantSidcsInUse](const ParticipantManagement::Participant & data)
   {
-    const QString &sidcCode = QString::fromStdString(data.symbol());
+    const QString &sidcCode = QString::fromStdString(data.symbol);
 
     if (AdvancedSymbology::SidcCodec::isEncoded(sidcCode))
     {
@@ -822,7 +822,7 @@ void InterfaceImpl::readSymbolFavouritesRequest(const QString &favName, QString
     return;
   }
 
-  int fileId = fileContent.id();
+  int fileId = fileContent.id;
   QByteArray content;
 
   if (!m_internal->m_flmGui->loadContent(fileId, content, true))
@@ -929,23 +929,23 @@ void InterfaceImpl::storeSymbolFavouritesRequest(const QString &favName, const Q
       LtsWidgets::LtsMessageDialog::showMessage(m_session->baseLayout(), msg, m_internal->m_messageBoxTitle);
       return;
     }
-    if (!m_internal->m_flmGui->saveContent(favContent.id(), favXMLContent.toUtf8(), QString()))
+    if (!m_internal->m_flmGui->saveContent(favContent.id, favXMLContent.toUtf8(), QString()))
       ERROR_LOG(m_logger) << "Cannot save symbol favourites in library";
   }
   else
   {
-    favContent.name(favName.toStdString());
+    favContent.name = favName.toStdString();
-    favContent.isTemplate(false);
+    favContent.isTemplate = false;
-    favContent.isUsedBy(false);
+    favContent.isUsedBy = false;
-    favContent.usedBy(0);
+    favContent.usedBy = 0;
-    favContent.folderId(folderId);
+    favContent.folderId = folderId;
-    favContent.fileStatus(FileManagement::FileStatus::Valid);
+    favContent.fileStatus = FileManagement::FileStatus::Valid;
-    favContent.fileCategory(FileManagement::FileCategory::Global);
+    favContent.fileCategory = FileManagement::FileCategory::Global;
-    favContent.fileType(FileManagement::FileType::OperatorFavourite);
+    favContent.fileType = FileManagement::FileType::OperatorFavourite;
-    favContent.exerciseId();
+    favContent.exerciseId = 0;
-    favContent.phaseId();
+    favContent.phaseId = 0;
-    favContent.lastModified(QDateTime::currentMSecsSinceEpoch());
+    favContent.lastModified = QDateTime::currentMSecsSinceEpoch();
-    favContent.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
+    favContent.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
     
 
     ERROR_LOG(m_logger) << "New file content = " << favXMLContent;

qt6-after/qt6-migrated-legatus/Lts/Plugins/PlanEditor/PlanEditorPlugin/Gui/plan_editor_gui_plugin.h

@@ -6,7 +6,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Lts/Common/ProjectConfig/project_defines.h>
 #include <PlanEditor/PlanEditorPlugin/plan_editor_gui_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 
 #include <QtCore/QObject>
 

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/vwm_api.cpp

@@ -33,7 +33,7 @@ namespace VWM
 namespace
 {
 // Ensure QPoint3D meta-type is registered for queued connections
-// Q_DECLARE_METATYPE is sufficient for custom types
+// Qt6: Q_DECLARE_METATYPE is sufficient, no need for qRegisterMetaTypeStreamOperators
 static const bool point3dRegistered = []() {
     return true;
 }();

qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Common/typestruct.cpp

@@ -23,7 +23,7 @@ TypeStruct::TypeStruct(const rpr2::EntityTypeStruct &eis)
 
 TypeStruct TypeStruct::fromString(const QString &string)
 {
-  const QVector<QStringView> sl = QStringView(string).split(QLatin1Char('.'));
+  const QVector<QStringRef> sl = string.splitRef(QLatin1Char('.'));
 
   TypeStruct ts;
   bool bOk;

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/av_socket.cpp

@@ -104,7 +104,8 @@ void AVSocket::onConnectToAVS()
             this, &AVSocket::onDisconnected);
     connect(m_avsSocket, &QTcpSocket::connected,
             this, [this] {m_bErrorInTcpComWarnedOnce = false;});
-    // errorOccurred signal replaces error() getter/signal
+    // Qt6: QAbstractSocket::error() (the getter/signal overload pair) was
+    // replaced by the errorOccurred signal.
     connect(m_avsSocket, &QAbstractSocket::errorOccurred,
             this, &AVSocket::onError);
     connect(m_avsSocket, &QTcpSocket::readyRead,

qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GeoPairing/GeoPairing/GeoPairing.cpp

@@ -136,24 +136,24 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
   while (i.hasNext())
   {
     i.next();
-    SInt32 vulnerabilityState = i.value().vulnerabilityState;
+    SInt32 vulnerabilityState = static_cast<SInt32>(i.value().vulnerabilityState);
-    Float64 lat = i.value().pos().lat() * 180 / M_PI;
+    Float64 lat = i.value().pos.lat * 180 / M_PI;
-    Float64 lon = i.value().pos().lon() * 180 / M_PI;
+    Float64 lon = i.value().pos.lon * 180 / M_PI;
     DEBUG_LOG(m_logger) << "GeoPairing::calculateAirFire"
                         << "\nl_Updater->update : " << i.key()
-                        << "\n: participantId=" << i.value().participantId()
+                        << "\n: participantId=" << i.value().participantId
-                        << "\n participantTypeId= " << i.value().participantTypeId()
+                        << "\n participantTypeId= " << i.value().participantTypeId
                         << "\n pos lat=" << lat
                         << "\n lon=" << lon
-                        << "\n alt=" << i.value().pos().z()
+                        << "\n alt=" << i.value().pos.z
-                        << "\n posTime=" << i.value().sampleTime()
+                        << "\n posTime=" << i.value().sampleTime
                         << "\n state=" << i.value().vulnerabilityState
                         << "\n state (SInt32)=" << vulnerabilityState;
-    l_Updater->update(i.value().participantId(),
+    l_Updater->update(i.value().participantId,
                       lat,
                       lon,
-                      i.value().pos().z(),
+                      i.value().pos.z,
-                      i.value().sampleTime() / 1000, //s
+                      i.value().sampleTime / 1000, //s
                       vulnerabilityState);
   }
 
@@ -225,7 +225,7 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
     if (l_TargetFound != l_CachedTrackingState || l_TimeoutPassed)
     {
       // prepare response for player
-      m_reportTarget.playerId = i.value().participantId();
+      m_reportTarget.playerId = i.value().participantId;
       m_reportTarget.sendData.clear();
       m_reportTarget.sendData.append(0xEB); // Report Target Detection
 
@@ -843,11 +843,11 @@ bool GeoPairing::geoPairingData(const std::shared_ptr<N_Ballistic::BallisticServ
   while (i.hasNext())
   {
     i.next();
-    DEBUG_LOG(m_logger) << i.key() << ": participantId=" << i.value().participantId()
+    DEBUG_LOG(m_logger) << i.key() << ": participantId=" << i.value().participantId
-                        << " participantTypeId= " << i.value().participantTypeId()
+                        << " participantTypeId= " << i.value().participantTypeId
-                        << " pos lat=" << i.value().pos().lat()
+                        << " pos lat=" << i.value().pos.lat
-                        << " pos lon=" << i.value().pos().lon()
+                        << " pos lon=" << i.value().pos.lon
-                        << " z=" << i.value().pos().z();
+                        << " z=" << i.value().pos.z;
   }
 
 

qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.cpp

@@ -94,6 +94,7 @@ bool HandlerMainStructureElement::init()
   }
 
   // add structure elements to global map for lookup (e.g. in 'add Footprints to MSE objects')
+  // Qt6: QMap::unite removed -> merge manually (unite semantics: overwrite existing keys)
   for (ObjectMainStructureElement *objMse : std::as_const(m_objectMainStructureElementMap))
   {
     const auto &seMap = objMse->getStructureElements();

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

@@ -29,9 +29,6 @@ SET(SRCS_common
 # these build-dir paths, so the copies are gone rather than kept for forbidden
 # OFF variants.
 
-# Define target name early for use in subsequent macros
-SET(PDM_COMMON_TARGET svcPdmCommon)
-
 # Add current binary dir to include path for generated headers
 NGL_TARGET_INCLUDE_DIRECTORIES(${PDM_COMMON_TARGET}
   PUBLIC
@@ -101,6 +98,7 @@ IF(BUILD_RTI)
 ENDIF()
 
 # Create svcPdmCommon library with common sources
+SET(PDM_COMMON_TARGET svcPdmCommon)
 NGL_ADD_LIBRARY(AAR SV WS HLA ${PDM_COMMON_TARGET} SHARED  ${SRCS_common})
 generate_export_header(${PDM_COMMON_TARGET}
   EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/svcpdmcommon_export.h"

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/service_idl_files.txt

@@ -1,28 +1,28 @@
 -- all available service idl files
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build-rti-on/Lts/DDS/Core/core.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build-rti-on/Lts/DDS/Core/core.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build-rti-on/Lts/DDS/Core/core_enums.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build-rti-on/Lts/DDS/Core/core_enums.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/core.xml
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/core.xml
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_enums.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_enums.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_service.xml
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_service.xml
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_enums.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_enums.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_service.xml
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_service.xml
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_enums.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_enums.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_service.xml
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_service.xml
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_enums.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_enums.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_service.xml
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_service.xml
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_enums.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_enums.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_service.xml
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_service.xml
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_enums.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_enums.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_service.xml
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_service.xml
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_enums.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_enums.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_service.xml
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_service.xml
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_enums.idl
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_enums.idl
-${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_service.xml
+/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_service.xml

qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp

@@ -487,7 +487,8 @@ void DataManager::onNotification(const QString &name, QSqlDriver::NotificationSo
   const QString triggerNameEx0 = triggerName(0);
   if (name.contains(triggerNameEx0))
   {
-    // Extract name after trigger prefix
+    // Qt6: QStringRef removed; QString::mid returns a QString with the
+    // same substring semantics.
     QString name_ = name.mid(triggerNameEx0.size() + 1);
     int exerciseId = name_.toInt();
     int participantId = payload.toInt();

qt6-after/qt6-migrated-legatus/Lts/Tools/Adler/WebSocketSimulator/awss_base_layout.cpp

@@ -17,7 +17,7 @@
 //other
 #include "awss_websocket_interface.h"
 
-#include <QtGui/QAction> // QAction moved to QtGui
+#include <QtGui/QAction> // Qt6: QAction moved from QtWidgets to QtGui
 #include <QtWidgets/QMenu>
 
 namespace AdlerWebSocketSimulator {

qt6-after/qt6-migrated-legatus/Lts/Tools/DataSampleReceiver/main.cpp

@@ -30,6 +30,7 @@ static QVector<DDSGeneric::TopicDescription> getAvailableTopicTypes() // get top
       return false;
 
     QMap<std::string,DDSGeneric::TopicDescription> topics = typePlugin->getDataTopics();
+    // Qt6: QMap::unite removed; insert() keeps the same "existing keys win" semantics
     topics.insert(typePlugin->getFunctionTopics());
 
     QMap<std::string, DDSGeneric::TopicDescription>::iterator it = topics.begin();
@@ -71,6 +72,7 @@ public:
       return availDataTopics;
 
     // Convert list of DoTypes, separated by comma (given by user)
+    // Qt6: QStringRef/QString::splitRef removed; QStringView::split provides the same tokenization
     const QString doTypeStr = value(QLatin1String("t"));
     const QList<QStringView> strList = QStringView{doTypeStr}.split(QLatin1Char(','), Qt::SkipEmptyParts);
 

qt6-after/qt6-migrated-legatus/Lts/Tools/LogViewer/logviewtableview.cpp

@@ -10,7 +10,7 @@
 #include "logviewtableview.h"
 #include "logviewtablemodel.h"
 
-#include <QtGui/QAction> // QAction moved to QtGui
+#include <QtGui/QAction> // Qt6: QAction moved from QtWidgets to QtGui
 #include <QtGui/QColor>
 #include <QColorDialog>
 #include <QtGui/QIcon>

qt6-after/qt6-migrated-legatus/Lts/Tools/LogViewer/sortfiltermodel.cpp

@@ -17,7 +17,8 @@ void SortFilterModel::setStartDateFilter(const QDateTime &start)
   if (m_start == start)
     return;
   m_start = start;
-  invalidateFilter();
+  beginFilterChange();
+    endFilterChange();
 }
 
 
@@ -26,7 +27,8 @@ void SortFilterModel::setEndDateFilter(const QDateTime &end)
   if (m_end == end)
     return;
   m_end = end;
-  invalidateFilter();
+  beginFilterChange();
+    endFilterChange();
 }
 
 void SortFilterModel::figureFilterOut()
@@ -41,7 +43,8 @@ void SortFilterModel::resetAllFilter()
   m_start = QDateTime();
   m_end = QDateTime();
   figureFilterOut();
-  invalidateFilter();
+  beginFilterChange();
+    endFilterChange();
 }
 
 

qt6-after/qt6-migrated-legatus/Lts/Tools/ProjectSettingsEditor/main_window.cpp

@@ -13,7 +13,7 @@
 
 #include <NGLLogger/INGLLogger.h>
 
-#include <QtGui/QAction> // QAction moved to QtGui
+#include <QtGui/QAction> // Qt6: QAction moved from QtWidgets to QtGui
 #include <QtCore/QFile>
 #include <QtWidgets/QFileDialog>
 #include <QtCore/QJsonArray>

qt6-after/qt6-migrated-legatus/Lts/Tools/TextEditorTest/textedit.cpp

@@ -367,7 +367,7 @@ bool TextEdit::load(const QString &f)
     return false;
 
   QByteArray data = file.readAll();
-  // QTextCodec removed in Qt6; use UTF-8
+  // Qt6: QTextCodec/Qt::codecForHtml removed; decode as UTF-8
   QString str = QString::fromUtf8(data);
   if (Qt::mightBeRichText(str)) {
     QUrl baseUrl = (f.front() == QLatin1Char(':') ? QUrl(f) : QUrl::fromLocalFile(f)).adjusted(QUrl::RemoveFilename);

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

@@ -4,10 +4,9 @@
 # $Author$
 #
 
-# LtsDataView must be built before SituationMap (advancedSymbology depends on it)
+ADD_SUBDIRECTORY(SituationMap)
 IF(BUILD_RTI OR BUILD_VIEWER_ONLY)
   ADD_SUBDIRECTORY(LtsDataView)
 ENDIF()
-ADD_SUBDIRECTORY(SituationMap)
 ADD_SUBDIRECTORY(LtsFileDialog)
 ADD_SUBDIRECTORY(LtsReportDisplay)

qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/lts_dialog_model_folder.cpp

@@ -346,7 +346,7 @@ void DialogModelProxyFolder::setOperatorId(int operatorId)
     return;
   m_operatorId = operatorId;
   beginFilterChange();
-  endFilterChange();
+    endFilterChange();
 }
 
 } // namespace LtsWidgets

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/situationmapelevationmap_export.h

@@ -1,21 +0,0 @@
-/**
-  * Export definitions
-  * $Id$
-  * $HeadURL$
-  * $Author$
-  */
-#pragma once
-
-#include <qglobal.h>
-
-#ifndef SITUATIONMAPELEVATIONMAP_EXPORT
-# ifdef BUILD_STATIC_LIBRARIES
-#  define SITUATIONMAPELEVATIONMAP_EXPORT
-# else
-#  if defined(MAKE_SITUATIONMAPELEVATIONMAP_LIB)
-#   define SITUATIONMAPELEVATIONMAP_EXPORT Q_DECL_EXPORT
-#  else
-#   define SITUATIONMAPELEVATIONMAP_EXPORT Q_DECL_IMPORT
-#  endif
-# endif
-#endif

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

@@ -1,9 +0,0 @@
-#
-# $Id$
-# $HeadURL$
-# $Author$
-#
-
-# ADD_SUBDIRECTORY(Viewshed3D)
-
-

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

@@ -1,43 +0,0 @@
-#
-# $Id$
-# $HeadURL$
-# $Author$
-#
-
-# Evaluation application for 3D viewshed
-
-FIND_PACKAGE(ArcGIS REQUIRED)
-
-INCLUDE_DIRECTORIES(${ARCGIS_INCLUDE_DIR}/arcgis)
-
-SET(EXE_SRCS
-  main.cpp
-  ViewshedLocation.cpp
-)
-
-SET(EXE_HDRS
-  ViewshedLocation.h
-)
-
-SOURCE_GROUP(EvalViewshed3DApp   FILES ${EXE_SRCS} ${EXE_HDRS})
-
-NGL_ADD_EXECUTABLE(WS NO_TRANSLATION EvalViewshed3DApp ${EXE_SRCS} ${EXE_HDRS})
-
-NGL_TARGET_LINK_LIBRARIES(
-  EvalViewshed3DApp
-  ArcGIS::ArcGIS
-  Qt6::Core
-  Qt6::Gui
-  Qt6::Widgets
-  Qt6::Network
-)
-
-
-IF(MSVC)
-  # Configure the template file
-  SET(VS_USER_FILE EvalViewshed3DApp.vcxproj.user)
-  configure_file( ../../SituationMap.vcxproj.user.in ${CMAKE_CURRENT_BINARY_DIR}/${VS_USER_FILE} @ONLY)
-ENDIF(MSVC)
-
-NGL_INSTALL_TARGET(EvalViewshed3DApp)
-

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/EvalApps/Viewshed3D/LocationViewshed.pro

@@ -1,58 +0,0 @@
-#-------------------------------------------------
-# Copyright 2015 Esri.
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#-------------------------------------------------
-
-mac {
-    cache()
-}
-
-CONFIG += c++11 esri_runtime_qt100_0_0 debug
-
-QT += core gui opengl xml network positioning sensors
-
-win32:CONFIG += \
-  embed_manifest_exe
-
-TARGET = LocationViewshed
-TEMPLATE = app
-
-SOURCES += \
-    main.cpp \
-    ViewshedLocation.cpp
-
-HEADERS  += \
-    ViewshedLocation.h
-
-
-win32 {
-  INCLUDEPATH     += "C:/Program Files (x86)/ArcGIS SDKs/Qt100.0/sdk/include"
-  debug:LIBPATH   += "C:/Program Files (x86)/ArcGIS SDKs/Qt100.0/sdk/windows/x64/lib/Debug"
-  release:LIBPATH += "C:/Program Files (x86)/ArcGIS SDKs/Qt100.0/sdk/windows/x64/lib/Release"
-  debug:LIBS      += -lEsriCommonQtd
-  release:LIBS    += -lEsriCommonQt
-  debug:LIBS      += -lEsriRuntimeQtd
-  release:LIBS    += -lEsriRuntimeQt
-}
-
-linux {
-  INCLUDEPATH += /usr/include/arcgis
-  LIBS        += -lEsriCommonQt
-  LIBS        += -lEsriRuntimeQt
-  LIBS        += -lc++
-}
-
-
-macx {
-    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
-}

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/EvalApps/Viewshed3D/ViewshedLocation.cpp

@@ -1,274 +0,0 @@
-/**
-  * @RDE_HEADER@
-  * Declaration/Definition
-  * $Id$
-  * $HeadURL$
-  * $Author$
-  */
-// [WriteFile Name=ViewshedLocation, Category=Analysis]
-// [Legal]
-// Copyright 2017 Esri.
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
-
-#include "ViewshedLocation.h"
-
-#include "ArcGISTiledElevationSource.h"
-#include "Scene.h"
-#include "SceneGraphicsView.h"
-#include "ExploratoryLocationViewshed.h"
-#include "Camera.h"
-#include "Point.h"
-#include "AnalysisOverlay.h"
-
-#include "QColor"
-
-
-using namespace Esri::ArcGISRuntime;
-
-ViewshedLocation::ViewshedLocation(QObject* parent /* = nullptr */):
-  QObject(parent)
-{
-}
-
-void ViewshedLocation::init(Esri::ArcGISRuntime::SceneGraphicsView* sceneView)
-{
-  m_sceneView = sceneView;
-
-  // Register classes for QML
-//  qmlRegisterType<SceneQuickView>("Esri.Samples", 1, 0, "SceneView");
-//  qmlRegisterType<ViewshedLocation>("Esri.Samples", 1, 0, "ViewshedLocationSample");
-
-
-  Surface* surface = new Surface(this);
-  surface->elevationSources()->append(
-        new ArcGISTiledElevationSource(
-          QUrl(QStringLiteral("http://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer")),
-          this));
-  m_sceneView->arcGISScene()->setBaseSurface(surface);
-
-  // set initial viewpoint
-  setInitialViewpoint();
-
-  // connect signals
-  connectSignals();
-}
-
-
-void ViewshedLocation::setInitialViewpoint()
-{
-  // Set a viewpoint
-  double x = 6.86088;
-  double y = 45.3604;
-  double z = 3582.55;
-  Point point(x, y, z, SpatialReference(4326));
-  double heading = 345;
-  double pitch = 70;
-  double roll = 0;
-  Camera camera(point, heading, pitch, roll);
-  m_sceneView->setViewpointCamera(camera);
-}
-
-void ViewshedLocation::connectSignals()
-{
-  // on mouse click perform the location viewshed
-  connect(m_sceneView, &SceneGraphicsView::mouseClicked, this, [this](QMouseEvent& event)
-  {
-    if (!m_locationViewshed[0])
-      createViewshed(event.position().x(), event.position().y());
-    else
-    {
-      for (int i = 0; i < 3; ++i)
-      {
-        const Point pt = m_sceneView->screenToBaseSurface(event.position().x(), event.position().y());
-        m_locationViewshed[i]->setLocation(pt);
-      }
-    }
-  });
-
-  connect(m_sceneView, &SceneGraphicsView::mousePressedAndHeld, this, [this](QMouseEvent& event)
-  {
-    if (!m_locationViewshed[0])
-      createViewshed(event.position().x(), event.position().y());
-
-    m_calculating = true;
-  });
-
-  connect(m_sceneView, &SceneGraphicsView::mouseMoved, this, [this](QMouseEvent& event)
-  {
-    if (m_calculating)
-    {
-      for (int i = 0; i < 3; ++i)
-      {
-        const Point pt = m_sceneView->screenToBaseSurface(event.position().x(), event.position().y());
-        m_locationViewshed[i]->setLocation(pt);
-      }
-    }
-  });
-
-  connect(m_sceneView, &SceneGraphicsView::mouseReleased, this, [this](QMouseEvent)
-  {
-    m_calculating = false;
-  });
-}
-
-void ViewshedLocation::createViewshed(double x, double y)
-{
-
-  m_analysisOverlay = new AnalysisOverlay(this);
-  m_sceneView->analysisOverlays()->append(m_analysisOverlay);
-
-
-  const Point pt = m_sceneView->screenToBaseSurface(x, y);
-
-  qCritical() << " pt=";
-  qCritical() << " pt=" << pt.x();
-  qCritical() << " pt=" << pt.y();
-  qCritical() << " pt=" << pt.z();
-
-  for (int i = 0; i < 3; ++i)
-  {
-    double heading = i * 120.0;
-    m_locationViewshed[i] = new ExploratoryLocationViewshed(pt
-      , heading
-      , 90.0   // pitch
-      , 120.0  // horizontalAngle
-      , 90.0   // verticalAngle
-      , 10.0  // minDistance
-      , 20000
-      , this);
-
-
-    m_locationViewshed[i]->setVisible(m_viewshedVisible);
-
-    // Add the Viewshed to the Analysis Overlay
-    m_analysisOverlay->analyses()->append(m_locationViewshed[i]);
-
-    m_locationViewshed[i]->setFrustumOutlineVisible(true);
-
-    // QColor frustumColor(0, 0, 0, 255);
-    // m_locationViewshed->setFrustumOutlineColor(frustumColor);
-  }
-  return;
-}
-
-// Getters/Setters for each Q_PROPERTY
-bool ViewshedLocation::isViewshedVisible() const
-{
-  return m_viewshedVisible;
-}
-
-void ViewshedLocation::setViewshedVisible(bool viewshedVisible)
-{
-  for (int i = 0; i < 3; ++i)
-  {
-    if (m_locationViewshed[i])
-    {
-      if (m_locationViewshed[i]->isVisible() == viewshedVisible)
-      {
-        continue;
-      }
-      
-      m_locationViewshed[i]->setVisible(viewshedVisible);
-    }
-  }
-
-  if (m_viewshedVisible != viewshedVisible)
-  {
-    m_viewshedVisible = viewshedVisible;
-
-    emit viewshedVisibleChanged();
-  }
-}
-
-bool ViewshedLocation::isFrustumOutlineVisible() const
-{
-  return m_locationViewshed[0] ? m_locationViewshed[0]->isFrustumOutlineVisible() : m_frustumVisible;
-}
-
-void ViewshedLocation::setFrustumOutlineVisible(bool frustumVisible)
-{
-  for (int i = 0; i < 3; ++i)
-  {
-    if (m_locationViewshed[i])
-    {
-      if (m_locationViewshed[i]->isFrustumOutlineVisible() == frustumVisible)
-      {
-        continue;
-      }
-
-      m_frustumVisible = frustumVisible;
-      m_locationViewshed[i]->setFrustumOutlineVisible(frustumVisible);
-    }
-  }
-
-  if (m_frustumVisible != frustumVisible)
-  {
-    m_frustumVisible = frustumVisible;
-    emit frustumVisibleChanged();
-  }
-}
-
-double ViewshedLocation::minDistance() const
-{
-  return m_locationViewshed[0] ? m_locationViewshed[0]->minDistance() : m_minDistance;
-}
-
-void ViewshedLocation::setMinDistance(double minDistance)
-{
-  for (int i = 0; i < 3; ++i)
-  {
-    if (m_locationViewshed[i])
-    {
-      if (m_locationViewshed[i]->minDistance() == minDistance)
-      {
-        continue;
-      }
-      m_locationViewshed[i]->setMinDistance(minDistance);
-    }
-  }
-
-  if (m_minDistance != minDistance)
-  {
-    m_minDistance = minDistance;
-    emit minDistanceChanged();
-  }
-}
-
-double ViewshedLocation::maxDistance() const
-{
-  return m_locationViewshed[0] ? m_locationViewshed[0]->maxDistance() : m_maxDistance;
-}
-
-void ViewshedLocation::setMaxDistance(double maxDistance)
-{
-  for (int i = 0; i < 3; ++i)
-  {
-    if (m_locationViewshed[i])
-    {
-      if (m_locationViewshed[i]->maxDistance() == maxDistance)
-      {
-        continue;
-      }
-      m_locationViewshed[i]->setMaxDistance(maxDistance);
-    }
-  }
-
-  if (m_maxDistance != maxDistance)
-  {
-    m_maxDistance = maxDistance;
-    emit maxDistanceChanged();
-  }
-}
-
-

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/EvalApps/Viewshed3D/ViewshedLocation.h

@@ -1,99 +0,0 @@
-/**
-  * @RDE_HEADER@
-  * Declaration/Definition
-  * $Id$
-  * $HeadURL$
-  * $Author$
-  */
-// [WriteFile Name=ViewshedLocation, Category=Analysis]
-// [Legal]
-// Copyright 2017 Esri.
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// [Legal]
-
-#ifndef VIEWSHEDLOCATION_H
-#define VIEWSHEDLOCATION_H
-
-#include <QObject>
-#include <QColor>
-
-
-namespace Esri
-{
-namespace ArcGISRuntime
-{
-class SceneGraphicsView;
-class ExploratoryLocationViewshed;
-class AnalysisOverlay;
-}
-}
-
-
-class ViewshedLocation : public QObject
-{
-  Q_OBJECT
-
-public:
-  explicit ViewshedLocation(QObject* parent = nullptr);
-  ~ViewshedLocation() = default;
-
-//  void componentComplete() Q_DECL_OVERRIDE;
-  void init(Esri::ArcGISRuntime::SceneGraphicsView* sceneView);
-
-  Q_PROPERTY(bool viewshedVisible READ isViewshedVisible WRITE setViewshedVisible NOTIFY viewshedVisibleChanged)
-  Q_PROPERTY(bool frustumVisible READ isFrustumOutlineVisible WRITE setFrustumOutlineVisible NOTIFY frustumVisibleChanged)
-  Q_PROPERTY(double minDistance READ minDistance WRITE setMinDistance NOTIFY minDistanceChanged)
-  Q_PROPERTY(double maxDistance READ maxDistance WRITE setMaxDistance NOTIFY maxDistanceChanged)
-  
-
-  bool isViewshedVisible() const;
-  void setViewshedVisible(bool viewshedVisible);
-
-  bool isFrustumOutlineVisible() const;
-  void setFrustumOutlineVisible(bool frustumVisible);
-
-  double minDistance() const;
-  void setMinDistance(double minDistance);
-
-  double maxDistance() const;
-  void setMaxDistance(double maxDistance);
-
-  
-signals:
-  void viewshedVisibleChanged();
-  void frustumVisibleChanged();
-  void minDistanceChanged();
-  void maxDistanceChanged();
-  
-
-private:
-  void connectSignals();
-  void setInitialViewpoint();
-  void createViewshed(double x, double y);
-
-  Esri::ArcGISRuntime::SceneGraphicsView *m_sceneView = nullptr;
-  Esri::ArcGISRuntime::ExploratoryLocationViewshed  *m_locationViewshed[3] = { nullptr, nullptr, nullptr };
-  Esri::ArcGISRuntime::AnalysisOverlay   *m_analysisOverlay = nullptr;
-
-  bool m_viewshedVisible = true;
-  bool m_frustumVisible = false;
-  double m_minDistance = 50;
-  double m_maxDistance = 1000;
-  double m_horizontalAngle = 45;
-  double m_veriticalAngle = 90;
-  double m_heading = 0;
-  double m_pitch = 90;
-  bool m_calculating = false;
-};
-
-#endif // VIEWSHEDLOCATION_H

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/EvalApps/Viewshed3D/main.cpp

@@ -1,244 +0,0 @@
-/*
-**
-** @RDE_HEADER@
-** Showing artefacts when drawing 3D map.
-** $Id$
-** $HeadURL$
-** $Author$
-**
-** -----------------------------------------------------------------------------------------------
-**
-** Hardware-Environment: Intel-PC
-** Software-Environment: Windows 7, Linux, Qt 5.9. ArcGISRuntimeQt 100.1
-**
-** Language ........: C++ 11
-**
-** -----------------------------------------------------------------------------------------------
-**
-** Author ...........: Jörg Turla, SPD G, Tel. 3132
-**
-** -----------------------------------------------------------------------------------------------
-**
-** Notes .........:
-**
-**   08.11.2017, JT  : Initial
-**
-** -----------------------------------------------------------------------------------------------
-*/
-
-#include <QTimer>
-
-#include <QtCore/QDir>
-#include <QtCore/QUrl>
-#include <QtCore/QDebug>
-
-#include <QtGui/QSurface>
-
-#include <QtNetwork/QNetworkProxy>
-
-#include <QtWidgets/QApplication>
-#include <QtGui/QScreen>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QPushButton>
-
-#include <QtWidgets/QGraphicsScene>
-#include <QtWidgets/QGraphicsProxyWidget>
-
-
-#include <QtWidgets/QMainWindow>
-
-#include <Map.h>
-#include <Scene.h>
-#include <SceneGraphicsView.h>
-#include <GraphicsOverlay.h>
-#include <GeoView.h>
-#include <Basemap.h>
-#include <ArcGISTiledLayer.h>
-#include <Layer.h>
-#include <GraphicsOverlay.h>
-
-#include "ViewshedLocation.h"
-
-
-
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-class MapWindow : public QWidget
-{
-
-    Esri::ArcGISRuntime::Basemap           * m_basemap;
-    Esri::ArcGISRuntime::Scene             * m_scene;
-    Esri::ArcGISRuntime::SceneGraphicsView * m_sceneGraphicsView;
-    Esri::ArcGISRuntime::GeoView           * m_mapView;
-    Esri::ArcGISRuntime::GraphicsOverlay   * m_graphicsOverlay;
-
-    Qt::MouseButton                          m_pressedMouseButton;
-    QPoint                                   m_mouseMoveRefPos;
-    QFuture<void>                            m_pickingTask;
-    bool                                     m_pendingRequest;
-
-  public:
-
-    MapWindow() : QWidget(), m_graphicsOverlay(nullptr), m_pickingTask(), m_pendingRequest(false)
-    {
-      m_pressedMouseButton = Qt::MouseButton::NoButton;
-      m_mouseMoveRefPos    = QPoint();
-
-      m_basemap = new Esri::ArcGISRuntime::Basemap(this);
-      m_scene   = new Esri::ArcGISRuntime::Scene(m_basemap,this);
-
-      connect( m_basemap, &Esri::ArcGISRuntime::Map::errorOccurred  , this, &MapWindow::onErrorBasemap );
-      connect( m_scene  , &Esri::ArcGISRuntime::Scene::errorOccurred, this, &MapWindow::onErrorScene   );
-      connect( m_scene  , &Esri::ArcGISRuntime::Scene::doneLoading  , this, &MapWindow::onDoneLoading  );
-
-      m_sceneGraphicsView = nullptr;
-      try
-      {
-        m_sceneGraphicsView = new Esri::ArcGISRuntime::SceneGraphicsView(); // no parent,
-        m_sceneGraphicsView->setObjectName(QLatin1String("EsriSceneView"));
-        m_sceneGraphicsView->setFrameShape(QFrame::NoFrame); // frameless
-      }
-      catch (std::exception &stdEx)
-      {
-        const char *what = stdEx.what();
-        if (what)
-          qCritical()<< "MapWindow init SceneGraphicsView: std Exception " << " what: '" << what << "'";
-        else
-          qCritical() << "MapWindow init SceneGraphicsView: std Exception";
-
-        throw; // re-throw
-      }
-      catch (...)
-      {
-        qCritical() << "MapWindow init SceneGraphicsView: unknown Exception";
-        throw; // re-throw
-      }
-
-      if (!m_sceneGraphicsView)
-        return;
-
-      m_sceneGraphicsView->setArcGISScene(m_scene);
-
-      QHBoxLayout *layout = new QHBoxLayout(this);
-      layout->addWidget(m_sceneGraphicsView);
-
-      initMapLayer(QLatin1String("http://services.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"));
-      initMapLayer(QLatin1String("http://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer"));
-
-      Esri::ArcGISRuntime::Camera camera(28.4, 83.9, 10010.0, 10.0, 80.0, 300.0);
-      m_sceneGraphicsView->setViewpointCameraAndWait(camera);// set the viewpoint
-
-      /*
-      QPushButton * aButton = new QPushButton(tr("Click me"));  // toplevel widget
-      QGraphicsProxyWidget *proxy = m_sceneGraphicsView->QGraphicsView::scene()->addWidget(aButton);
-      proxy->setOpacity(0.99);
-
-      connect( aButton, &QPushButton::clicked, this, []() {qCritical() << "A Button has been clicked!";} );
-      */
-
-      QTimer *timer = new QTimer(this);
-      timer->setSingleShot(true);
-      timer->setInterval(5000);
-      connect(timer, &QTimer::timeout, this, [this]() {
-
-          qCritical() << "Create viewshed ...";
-        ViewshedLocation * vLoc = new ViewshedLocation(this);
-        vLoc->init(m_sceneGraphicsView);
-      });
-      timer->start();
-
-
-    } // MapWindow()
-
-
-    ~MapWindow() = default;
-
-
-    void initMapLayer( const QString &mapServiceUrl )
-    {
-      Esri::ArcGISRuntime::ArcGISTiledLayer  *tiledLayer = new Esri::ArcGISRuntime::ArcGISTiledLayer(QUrl(mapServiceUrl), this);
-      tiledLayer->setName(mapServiceUrl);
-      tiledLayer->setObjectName(tiledLayer->name());
-
-      m_basemap->baseLayers()->append(tiledLayer);
-
-    } // void initMapLayer()
-
-  private:
-
-    void onDoneLoading(const Esri::ArcGISRuntime::Error &loadError)
-    {
-
-    } // void onDoneLoading(const Esri::ArcGISRuntime::Error &loadError)
-
-
-    void onErrorBasemap(const Esri::ArcGISRuntime::Error &error)
-    {
-      qCritical() << " ---EsriError,Basemap --- occured: "
-                  << " code="              << error.code()
-                  << " domain="            << (int)error.domain()
-                  << " extendedErrorType=" << (int)error.extendedErrorType()
-                  << ", message='"         << error.message() << "'";
-    } // void onErrorBasemap(const Esri::ArcGISRuntime::Error &error)
-
-
-    void onErrorScene(const Esri::ArcGISRuntime::Error &error)
-    {
-      qCritical() << " ---EsriError, Scene --- occured: "
-                  << " code="              << error.code()
-                  << " domain="            << (int)error.domain()
-                  << " extendedErrorType=" << (int)error.extendedErrorType()
-                  << ", message='"         << error.message() << "'";
-    } // void onErrorScene(const Esri::ArcGISRuntime::Error &error)
-
-
-}; // MapWindow
-
-
-int main(int argc, char* argv[])
-{
-  QApplication app(argc,argv);
-
-  // ESRI :
-#ifdef Q_OS_WIN
-  // Force usage of OpenGL ES through ANGLE on Windows
-  QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
-#endif
-  // : ESRI
-
-#define PROXY
-#ifdef PROXY
-  QNetworkProxy proxy;
-  proxy.setType(QNetworkProxy::HttpProxy);
-  proxy.setHostName(QStringLiteral("proxy-rde"));
-  proxy.setPort(8080);
-  proxy.setUser(QStringLiteral("norbert.thoden@rheinmetall.com"));
-  proxy.setPassword(QStringLiteral("RDEWWW11"));
-  QNetworkProxy::setApplicationProxy(proxy);
-#endif
-
-  MapWindow * mapWin = new MapWindow();
-
-  int width        = mapWin->frameGeometry().width();
-  int height       = mapWin->frameGeometry().height();
-
-  QScreen *screen = QGuiApplication::primaryScreen();
-  int screenWidth  = screen ? screen->size().width() : 1920;
-  int screenHeight = screen ? screen->size().height() : 1080;
-
-  mapWin->setGeometry((screenWidth / 2) - (width / 2), (screenHeight / 2) - (height / 2), width, height);
-
-  mapWin->show();
-
-  app.setQuitOnLastWindowClosed(true);
-
-  int retval = app.exec();
-
-  delete mapWin;
-
-  return retval;
-
-} // main

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/FunctionDialog/function_dialog.cpp

@@ -2661,7 +2661,7 @@ void FunctionDialog::onRubberbandApply(RB::RubberbandBase *rubberband)
         for (const auto &bufferPoint : qAsConst(bufferVertexList))
         {
           posCont << Point3D::fromQPointF(bufferPoint);
-          qDebug() << LOGFUNCTION << "buffer coordinate : " << bufferPoint;
+          qDebug() << LOGFUNCTION << "buffer coordinate : " << bufferPoint ;   // Qt6: fixed/qSetRealNumberPrecision removed
         }
 
         bufferPolygon->setPositionsTranslated(posCont); // use map coordinates to print the coordinate values

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/GraphicalObjects/graphical_object_renderer_attributes.cpp

@@ -103,7 +103,7 @@ bool GraphicalObjectRendererAttributes::updateViewImpl()
     if (m_logger.isDebugEnabled())
       qCritical() <<  " debugInfo='" << m_debugInfo << "'" << ", QVariantMap before unite " << cur;
 
-    // Insert only missing keys (QMap::unite() removed in Qt6)
+    // Qt6: QMap::unite() removed; insert only the keys not already present (unite semantics).
     const QVariantMap otherAttrs = m_attributeMap.value();
     for (auto it = otherAttrs.constBegin(); it != otherAttrs.constEnd(); ++it)
       if (!cur.contains(it.key()))

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

@@ -1,37 +0,0 @@
-#
-# $Id$
-# $HeadURL$
-# $Author$
-#
-
-# LIBRARY
-
-SET(LocalServer_SRCS
-  local_server_export
-  local_server.cpp
-  local_server.h
-)
-
-SOURCE_GROUP(LocalServer FILES ${LocalServer_SRCS})
-
-NGL_ADD_LIBRARY(WS situationMapLocalServer SHARED ${LocalServer_SRCS})
-NGL_TARGET_LINK_LIBRARIES(situationMapLocalServer
-  PRIVATE
-    ArcGIS::ArcGIS
-    NGLLogger
-    Qt6::Gui  # can be removed once we get an official ESRI ArcGIS Qt version again
-  PUBLIC
-    Qt6::Core
-    situationMapCommon
-)
-
-# ESRI: /usr/include/arcgis/LocalServer/LocalServer.h: '#include "Object.h"'
-# so add required include path here as PRIVATE:
-NGL_TARGET_INCLUDE_DIRECTORIES(situationMapLocalServer
-  PRIVATE
-    ${ARCGIS_INCLUDE_DIR}/arcgis
-  INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/..
-)
-
-NGL_INSTALL_TARGET(situationMapLocalServer)

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LocalSrv/local_server.cpp

@@ -1,519 +0,0 @@
-/**
-  * @RDE_HEADER@
-  * LocalServer
-  * $Id$
-  * $HeadURL$
-  * $Author$
-  */
-
-// Own
-#include "local_server.h"
-#include <Common/resource_path.h>
-
-
-// ESRI
-#include <Error.h>
-
-#include <LocalServer/LocalServer.h>
-#include <LocalServer/LocalGeoprocessingService.h>
-
-
-//Qt
-#include <QMap>
-
-
-namespace Esri
-{
-namespace ArcGISRuntime
-{
-
-QString toString(const Esri::ArcGISRuntime::Error &value)
-{
-  std::ostringstream stream;
-  stream << "Esri::ArcGISRuntime::Error: "
-         << " code="                << value.code()
-         << ", domain="             << (int)value.domain()
-         << ", extendedErrorType="  << (int)value.extendedErrorType()
-         << ", message='"           << value.message() << "'"
-         << ", additionalMessage='" << value.additionalMessage() << "'";
-  return QString::fromStdString(stream.str());
-}
-
-std::ostream &operator<< (std::ostream &stream,
-                          const Esri::ArcGISRuntime::Error &value)
-{
-  stream << toString(value);
-  return stream;
-}
-
-} // namespace ArcGISRuntime
-} // namespace Esri
-
-
-//----------------------------------------------------------------------------
-namespace SituationMap
-{
-
-
-bool LocalServiceData::isEmpty() const
-{
-  return m_svcUrl.isEmpty();
-}
-
-void LocalServiceData::setSvcUrl(const QUrl &svcUrl)
-{
-  m_svcUrl = svcUrl;
-}
-
-const QUrl &LocalServiceData::svcUrl() const
-{
-  return m_svcUrl;
-}
-
-void LocalServiceData::setSync(bool sync)
-{
-  m_sync = sync;
-}
-
-bool LocalServiceData::isSync() const
-{
-  return m_sync;
-}
-
-
-//----------------------------------------------------------------------------
-
-static QString toString(const Esri::ArcGISRuntime::LocalServerStatus &value)
-{
-  switch (value)
-  {
-  case Esri::ArcGISRuntime::LocalServerStatus::Stopped:
-    return QLatin1String("Stopped");
-  case Esri::ArcGISRuntime::LocalServerStatus::Starting:
-    return QLatin1String("Starting");
-  case Esri::ArcGISRuntime::LocalServerStatus::Started:
-    return QLatin1String("Started");
-  case Esri::ArcGISRuntime::LocalServerStatus::Stopping:
-    return QLatin1String("Stopping");
-  case Esri::ArcGISRuntime::LocalServerStatus::Failed:
-    return QLatin1String("Failed");
-  } // switch
-  return QLatin1String("Esri-LocalServerStatusERROR");
-}
-
-
-
-//-----------------------------------------------------------------------------
-class LocalServer::Private
-{
-public:
-  Private()     = default;
-  ~Private()    = default;
-
-  // ESRI data:
-  Esri::ArcGISRuntime::LocalServer                               *m_localServer = nullptr;
-
-  // Own data:
-  QMap<QString, Esri::ArcGISRuntime::LocalGeoprocessingService *> m_gpServiceMap;
-  QMap<QString, QString>                                          m_serviceSubLocationMap;
-
-
-  QMap<QString, LocalServiceData>                                 m_svcData;
-
-
-}; // class LocalServer::Private
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-LocalServer *LocalServer::instance()
-{
-  static LocalServer *_instance = nullptr;
-  if (_instance == nullptr)
-    _instance = new LocalServer;
-  return _instance;
-}
-
-//-----------------------------------------------------------------------------
-LocalServer::LocalServer()
-  : BaseClass()
-  , m_logger(getLogger("LocalServer"))
-  , d(new Private)
-{
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-
-  DEBUG_LOG(m_logger) << LOGFUNCTION << " installPath = "
-                      << " '" << Esri::ArcGISRuntime::LocalServer::installPath() << "'";
-
-  QString newInstallPath;
-
-  QString user = QString::fromLocal8Bit( qgetenv("USER") );
-  if (user.compare(QLatin1Literal("ctc")) == 0)
-    newInstallPath = SituationMap::getResourcePath() + QLatin1String("/localserver100.2_ctc/");  // USER ctc
-  else
-    newInstallPath = SituationMap::getResourcePath() + QLatin1String("/localserver100.2/");      // USER ctc_ws
-
-  Esri::ArcGISRuntime::LocalServer::setInstallPath(newInstallPath);
-
-  if (Esri::ArcGISRuntime::LocalServer::isInstallValid())
-    NOTICE_LOG(m_logger) << LOGFUNCTION << " installPath ok = "
-                         << " '" << Esri::ArcGISRuntime::LocalServer::installPath() << "'";
-  else
-    FATAL_LOG(m_logger) << LOGFUNCTION << " installPath failed = "
-                        << " InstallPath = '" << Esri::ArcGISRuntime::LocalServer::installPath() << "'";
-
-  d->m_localServer = Esri::ArcGISRuntime::LocalServer::instance();
-
-  connect(d->m_localServer, &Esri::ArcGISRuntime::LocalServer::errorOccurred,
-          this, &LocalServer::onLocalServerError);
-  connect(d->m_localServer, &Esri::ArcGISRuntime::LocalServer::statusChanged,
-          this, &LocalServer::onLocalServerStatusChanged);
-
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-}
-
-LocalServer::~LocalServer()
-{
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-  this->stop();
-  delete d;
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-}
-
-void LocalServer::start()
-{
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-  d->m_localServer->start();
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-}
-void LocalServer::stop()
-{
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-
-  stopAllLocalGeoprocessingServices();
-  d->m_localServer->stop();
-
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-}
-
-bool LocalServer::isLocalServerStarted() const
-{
-  return d->m_localServer->status() == Esri::ArcGISRuntime::LocalServerStatus::Started;
-}
-bool LocalServer::isLocalServerStopped() const
-{
-  return d->m_localServer->status() == Esri::ArcGISRuntime::LocalServerStatus::Stopped;
-}
-
-
-bool LocalServer::setLocalGeoprocessingService(const QString &serviceName,
-                                               const QString &packagePath,
-                                               const QString &serviceSubLocation,
-                                               bool sync)
-{
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START"
-                      << " serviceName: '" << serviceName << "'"
-                      << " packagePath: '" << packagePath << "'"
-                      << " serviceSubLocation: '" << serviceSubLocation << "'";
-  if (d->m_gpServiceMap.contains(serviceName))
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName: '" << serviceName << "'" << " already provided";
-    return false;
-  }
-
-  QString localPackagePath = packagePath;
-
-  {
-    QFileInfo fileinfo(packagePath);
-    if (!fileinfo.isAbsolute())
-      localPackagePath = SituationMap::getResourcePath() + QLatin1String("/gpk/") + packagePath;
-  }
-  QFileInfo fileinfo(localPackagePath);
-
-  if (!fileinfo.exists())
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName: '" << serviceName << "'"
-                        << " packagePath does not exist: "
-                        << " localPackagePath: '" << localPackagePath << "'";
-    return false;
-  }
-  if (!fileinfo.isReadable())
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName: '" << serviceName << "'"
-                        << " packagePath is not readable: "
-                        << " localPackagePath: '" << localPackagePath << "'";
-    return false;
-  }
-
-
-  NOTICE_LOG(m_logger) << LOGFUNCTION << " create LocalGeoprocessingService: "
-                       << " localPackagePath: '" << localPackagePath << "'";
-
-
-  Esri::ArcGISRuntime::LocalGeoprocessingService *lgps =
-    new Esri::ArcGISRuntime::LocalGeoprocessingService(localPackagePath, this);
-  lgps->setObjectName(QString(QLatin1Literal("LocalGeoprocessingService-%1")).arg(serviceName));
-
-  if (sync)
-    lgps->setServiceType(Esri::ArcGISRuntime::GeoprocessingServiceType::SynchronousExecute); // SynchronousExecute | AsynchronousSubmit | ...
-  else
-    lgps->setServiceType(Esri::ArcGISRuntime::GeoprocessingServiceType::AsynchronousSubmit); // SynchronousExecute | AsynchronousSubmit | ...
-
-  connect(lgps, &Esri::ArcGISRuntime::LocalGeoprocessingService::errorOccurred,
-          this, &LocalServer::onLGPSError);
-  connect(lgps, &Esri::ArcGISRuntime::LocalGeoprocessingService::statusChanged,
-          this, &LocalServer::onLGPSStatusChanged);
-
-  // add to own management:
-  d->m_gpServiceMap[serviceName]          = lgps;
-  d->m_serviceSubLocationMap[serviceName] = serviceSubLocation;
-
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END"
-                      << " serviceName: '" << serviceName << "'"
-                      << " localPackagePath: '" << localPackagePath << "'"
-                      << " serviceSubLocation: '" << serviceSubLocation << "'";
-  return true;
-}
-
-bool LocalServer::startLocalGeoprocessingService(const QString &serviceName)
-{
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-
-  if (!d->m_gpServiceMap.contains(serviceName))
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << " not found";
-    return false;
-  }
-  Esri::ArcGISRuntime::LocalGeoprocessingService *lgps = d->m_gpServiceMap[serviceName];
-  if (!lgps)
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << ", no service";
-    return false;
-  }
-
-  if (isLocalServerStarted())
-    lgps->start();
-
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-  return true;
-}
-
-bool LocalServer::stopLocalGeoprocessingService(const QString &serviceName)
-{
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-
-  if (!d->m_gpServiceMap.contains(serviceName))
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << " not found";
-    return false;
-  }
-  Esri::ArcGISRuntime::LocalGeoprocessingService *lgps = d->m_gpServiceMap[serviceName];
-  if (!lgps)
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << ", no service";
-    return false;
-  }
-
-  lgps->stop();
-  return true;
-}
-
-bool LocalServer::isLocalGeoprocessingServiceStarted(const QString &serviceName) const
-{
-  if (!d->m_gpServiceMap.contains(serviceName))
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << " not found";
-    return false;
-  }
-  Esri::ArcGISRuntime::LocalGeoprocessingService *lgps = d->m_gpServiceMap[serviceName];
-  if (!lgps)
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << ", no service";
-    return false;
-  }
-  return lgps->status() == Esri::ArcGISRuntime::LocalServerStatus::Started;
-}
-bool LocalServer::isLocalGeoprocessingServiceStopped(const QString &serviceName) const
-{
-  if (!d->m_gpServiceMap.contains(serviceName))
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << " not found";
-    return false;
-  }
-  Esri::ArcGISRuntime::LocalGeoprocessingService *lgps = d->m_gpServiceMap[serviceName];
-  if (!lgps)
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << ", no service";
-    return false;
-  }
-  return lgps->status() == Esri::ArcGISRuntime::LocalServerStatus::Stopped;
-}
-
-bool LocalServer::isLocalGeoprocessingServiceSynchronousExecute(const QString &serviceName) const
-{
-  if (!d->m_gpServiceMap.contains(serviceName))
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << " not found";
-    return false;
-  }
-  Esri::ArcGISRuntime::LocalGeoprocessingService *lgps = d->m_gpServiceMap[serviceName];
-  if (!lgps)
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << ", no service";
-    return false;
-  }
-  return lgps->serviceType() == Esri::ArcGISRuntime::GeoprocessingServiceType::SynchronousExecute;
-}
-
-bool LocalServer::isLocalGeoprocessingServiceAsynchronousSubmit(const QString &serviceName) const
-{
-  if (!d->m_gpServiceMap.contains(serviceName))
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << " not found";
-    return false;
-  }
-  Esri::ArcGISRuntime::LocalGeoprocessingService *lgps = d->m_gpServiceMap[serviceName];
-  if (!lgps)
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << ", no service";
-    return false;
-  }
-  return lgps->serviceType() == Esri::ArcGISRuntime::GeoprocessingServiceType::AsynchronousSubmit;
-}
-
-bool LocalServer::localGeoprocessingServiceData(const QString &serviceName, LocalServiceData &localServiceDataOut) const
-{
-  if (!d->m_svcData.contains(serviceName))
-  {
-    DEBUG_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << " not found";
-    return false;
-  }
-  localServiceDataOut = d->m_svcData[serviceName];
-  return true;
-}
-
-void LocalServer::startAllPendingLocalGeoprocessingServices()
-{
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-
-  QMapIterator<QString, Esri::ArcGISRuntime::LocalGeoprocessingService *> mapIt(d->m_gpServiceMap);
-
-  while (mapIt.hasNext())
-  {
-    mapIt.next();
-    const QString &serviceName = mapIt.key();
-    Esri::ArcGISRuntime::LocalGeoprocessingService *lgps = mapIt.value();
-
-    if (!lgps)
-    {
-      ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << ", no service";
-      continue;
-    }
-
-    if (lgps->status() == Esri::ArcGISRuntime::LocalServerStatus::Started)
-    {
-      DEBUG_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << ", already started, continue";
-      continue;
-    }
-    else
-      lgps->start();
-  } // while
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-}
-
-void LocalServer::stopAllLocalGeoprocessingServices()
-{
-  QMapIterator<QString, Esri::ArcGISRuntime::LocalGeoprocessingService *> mapIt(d->m_gpServiceMap);
-
-  while (mapIt.hasNext())
-  {
-    mapIt.next();
-    const QString &serviceName = mapIt.key();
-    Esri::ArcGISRuntime::LocalGeoprocessingService *lgps = mapIt.value();
-
-    if (!lgps)
-    {
-      ERROR_LOG(m_logger) << LOGFUNCTION << " serviceName '" << serviceName << "'" << ", no service";
-      continue;
-    }
-    lgps->stop();
-  } // while
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-}
-
-
-void LocalServer::onLocalServerError(const Esri::ArcGISRuntime::Error &error)
-{
-  ERROR_LOG(m_logger) << LOGFUNCTION << " EsriError occured: " << error;
-}
-
-void LocalServer::onLocalServerStatusChanged()
-{
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-
-  NOTICE_LOG(m_logger) << LOGFUNCTION << " LocalServer: status changed to: " << toString(d->m_localServer->status());
-
-  emit localServerStatusChanged();
-
-  if (d->m_localServer->status() == Esri::ArcGISRuntime::LocalServerStatus::Started)
-  {
-    NOTICE_LOG(m_logger) << LOGFUNCTION << " LocalServer: STARTED"
-                         << " (url= '" << d->m_localServer->url().toString() << "')"
-                         << " (Esri::ArcGISRuntime::LocalServer->tempDataPath= '" << d->m_localServer->tempDataPath() << "')";
-    startAllPendingLocalGeoprocessingServices();
-  }
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-}
-
-void LocalServer::onLGPSError(const Esri::ArcGISRuntime::Error &error)
-{
-  QString senderName;
-  Esri::ArcGISRuntime::LocalGeoprocessingService *lgs = qobject_cast<Esri::ArcGISRuntime::LocalGeoprocessingService *>(sender());
-  if (lgs)
-    senderName = lgs->objectName();
-  ERROR_LOG(m_logger) << LOGFUNCTION << " LocalGeoprocessingService -> EsriError occured: " << error;
-}
-
-void LocalServer::onLGPSStatusChanged()
-{
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-
-  Esri::ArcGISRuntime::LocalGeoprocessingService *lgsp = qobject_cast<Esri::ArcGISRuntime::LocalGeoprocessingService *>(sender());
-
-  if (!lgsp)
-  {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " qobject_cast failed to get sender!?";
-    return;
-  }
-
-  QString senderName = lgsp->objectName();
-  const QString &serviceName = d->m_gpServiceMap.key(lgsp);
-
-  if (lgsp->status() == Esri::ArcGISRuntime::LocalServerStatus::Started)
-  {
-    NOTICE_LOG(m_logger) << LOGFUNCTION << " ***** LocalGeoprocessingService:"
-                         << " sender= '" << senderName << "'"
-                         << " status changed to: " << toString(lgsp->status())
-                         << " url= '" << lgsp->url().toString() << "'";
-
-    LocalServiceData svcData;
-
-    const QString &serviceSubLocation = d->m_serviceSubLocationMap[serviceName];
-    const QString &url = lgsp->url().toString() + QLatin1String("/") + serviceSubLocation;
-    svcData.setSvcUrl(QUrl(url));
-    svcData.setSync(lgsp->serviceType() == Esri::ArcGISRuntime::GeoprocessingServiceType::SynchronousExecute);
-
-    d->m_svcData[serviceName] = svcData; // store in own management
-
-    emit localGeoprocessingServiceStatusChanged(serviceName);
-    emit localGeoprocessingServiceStarted(serviceName, svcData);
-  }
-
-  NOTICE_LOG(m_logger) << LOGFUNCTION << " LocalGeoprocessingService:"
-                       << " sender= '" << senderName << "'"
-                       << " status changed to: " << toString(lgsp->status());
-
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-}
-
-} // namespace SituationMap
-

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LocalSrv/local_server.h

@@ -1,128 +0,0 @@
-/**
-  * @RDE_HEADER@
-  * LocalServer
-  * $Id$
-  * $HeadURL$
-  * $Author$
-  */
-
-#pragma once
-
-// Own
-#include "local_server_export.h"
-#include <Common/situation_map_logging.h>
-
-namespace Esri {
-namespace ArcGISRuntime {
-class Error;
-}
-}
-
-
-
-// Qt
-#include <QObject>
-#include <QUrl>
-#include <QString>
-
-
-//----------------------------------------------------------------------------
-namespace SituationMap
-{
-
-class LOCALSERVER_EXPORT LocalServiceData
-{
-private:
-  QUrl      m_svcUrl;
-  bool      m_sync = false;
-public:
-  bool isEmpty() const;
-
-  void setSvcUrl(const QUrl &svcUrl);
-  const QUrl &svcUrl() const;
-
-  void setSync(bool sync);
-  bool isSync() const;
-};
-
-
-
-/**
- * @brief The LocalServer class wrap ESRI`s LocalServer.
- * This is a container for geoprocessing services
- * The LocalServer has to be started as well as the seperate instances of LocalGeoprocessingService.
- * To ease the usage you should set the required number of LocalGeoprocessingService (with different serviceNames).
- * Then simply start the LocalServer (and if that is up all pending will be started.)
- */
-class LOCALSERVER_EXPORT LocalServer : public QObject
-{
-  Q_OBJECT
-
-  using BaseClass = QObject;
-
-private:
-  explicit LocalServer();
-  ~LocalServer();
-
-public:
-  /*! \name Check Installation ( no guarantee )*/
-  static bool isInstallValid();
-
-
-  /*! \name Singleton */
-  static LocalServer *instance();
-
-
-  /*! \name LocalServer */
-  //@{
-  void start();
-  void stop();
-
-  bool isLocalServerStarted() const;
-  bool isLocalServerStopped() const;
-  //@}
-
-  /*! \name LocalGeoprocessingService */
-  //@{
-  bool setLocalGeoprocessingService(const QString &serviceName, const QString &packagePath, const QString &serviceSubLocation, bool sync);
-  bool startLocalGeoprocessingService(const QString &serviceName);
-  bool stopLocalGeoprocessingService(const QString &serviceName);
-
-  bool isLocalGeoprocessingServiceStarted(const QString &serviceName) const;
-  bool isLocalGeoprocessingServiceStopped(const QString &serviceName) const;
-
-  bool isLocalGeoprocessingServiceSynchronousExecute(const QString &serviceName) const;
-  bool isLocalGeoprocessingServiceAsynchronousSubmit(const QString &serviceName) const;
-
-  bool localGeoprocessingServiceData(const QString &serviceName, LocalServiceData &localServiceDataOut) const;
-  //@}
-
-protected:
-  void startAllPendingLocalGeoprocessingServices();
-  void stopAllLocalGeoprocessingServices();
-
-protected Q_SLOTS:
-  void onLocalServerError(const Esri::ArcGISRuntime::Error &error);
-  void onLocalServerStatusChanged();
-
-  void onLGPSError(const Esri::ArcGISRuntime::Error &error);
-  void onLGPSStatusChanged();
-
-Q_SIGNALS:
-  void localServerStatusChanged();
-
-  void localGeoprocessingServiceStatusChanged(const QString &serviceName);
-  void localGeoprocessingServiceStarted(const QString &serviceName, const LocalServiceData&localSvcData);
-
-private:
-  LOGGER_T m_logger;      ///< Interface of the Logging-Facility
-
-  class Private;
-  /**
-      * The private d->pointer to not break BC when changing internals of this class
-     */
-  Private *d = nullptr;
-};
-
-} // namespace SituationMap
-

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/LocalSrv/local_server_export.h

@@ -1,21 +0,0 @@
-/**
-  * Export definitions
-  * $Id$
-  * $HeadURL$
-  * $Author$
-  */
-#pragma once
-
-#include <qglobal.h>
-
-#ifndef LOCALSERVER_EXPORT
-# ifdef BUILD_STATIC_LIBRARIES
-#  define LOCALSERVER_EXPORT
-# else
-#  if defined(MAKE_SITUATIONMAPLOCALSERVER_LIB)
-#   define LOCALSERVER_EXPORT Q_DECL_EXPORT
-#  else
-#   define LOCALSERVER_EXPORT Q_DECL_IMPORT
-#  endif
-# endif
-#endif

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MIGRATION_STATUS.md

@@ -1,269 +0,0 @@
-# SituationMap Module - Qt6 Migration Final Report
-
-## Executive Summary
-**Status: ✅ COMPLETE - Docker Build Validated**
-
-The Lts/Viewer/SituationMap module has been fully migrated from Qt5 to Qt6 and validated in the official Docker build environment with Qt 6.10.2 and ArcGIS Maps SDK v300.0.0.
-
-## Validation Environment
-- **Docker Image**: Custom migration container with Qt 6.10.2 (aqtinstall)
-- **ArcGIS SDK**: Maps SDK for Qt v300.0.0
-- **Build Script**: `./new_docker_build.sh --build-viewer-only --arcgis --no-ctest`
-- **Build Result**: ✅ SUCCESS (exit code 0)
-
-## Migration Scope
-All 22+ subdirectories from Qt5 legacy tree migrated to Qt6:
-- admin_scripts (shell scripts - no changes needed)
-- ArcGISQt5Hack (Qt5 compatibility hack - builds successfully, may need Qt6 review)
-- ElevationMap
-- EvalApps (including Viewshed3D)
-- FunctionDialog
-- GeometryModel
-- GraphicalObjects
-- LayerAggregation
-- LocalSrv
-- MapImpl
-- MapObjects
-- MapObjectsImpl
-- MathUtils
-- ModuleTests
-- Portal
-- README
-- Resources
-- Rubberbands
-- SideBar
-- Symbology
-- SymbologyGui
-- Tests (including EsriMapTouchTest, SitMapTestApp, CrashDictSymbol, LineOfSightEvaluation, RdeExample_Viewshed)
-- UnitTests
-- UnitTestsGeoModel
-- Utils
-
-## Qt6 API Changes Applied
-
-### 1. QTouchEvent API Updates (Qt6)
-**Files Modified:**
-- `Rubberbands/event_mouse_navigator.cpp`
-- `Rubberbands/gestures.cpp`
-- `Tests/EsriMapTouchTest/event_mouse_navigator.cpp`
-- `Tests/EsriMapTouchTest/gestures.cpp`
-
-**Changes:**
-- `touchPoints()` → `points()`
-- `screenPos()` → `globalPosition()` (returns QPointF)
-- `pos()` → `position()` for QMouseEvent/QWheelEvent
-- `event.x()/y()` → `event.position().x()/y()`
-- `TouchPoint::startPos()` → `QEventPoint::pressPosition()`
-
-### 2. Qt Button Enum Updates
-**Files Modified:**
-- `Rubberbands/event_mouse_navigator.cpp`
-- `Rubberbands/event_dispatcher.cpp`
-- `Tests/EsriMapTouchTest/event_mouse_navigator.cpp`
-
-**Changes:**
-- `Qt::MidButton` → `Qt::MiddleButton` (5 occurrences)
-
-### 3. QFuture Continuation Pattern (ArcGIS SDK v300)
-**Files Modified:**
-- `Rubberbands/event_mouse_navigator.cpp`
-- `Rubberbands/rubberband_multi_point_feature_3d.cpp`
-- `Rubberbands/rubberband_multi_point_feature_3d.h`
-
-**Changes:**
-- Removed deprecated `onGetPickingResult` slot
-- Changed from signal/slot pattern to QFuture `.then()` continuation
-- Updated `identifyGraphicsOverlays()` → `identifyGraphicsOverlaysAsync()`
-- Fixed parameter signature: `(QPointF&, double, bool, int, QObject*)`
-
-### 4. ArcGIS SDK v300 Include Path Fixes
-**Files Modified:**
-- `MapImpl/location_display_impl.cpp`
-- Multiple GraphicalObjects files
-- Multiple Rubberbands files
-
-**Changes:**
-- `#include <arcgis/Xxx.h>` → `#include <Xxx.h>`
-- Added explicit includes for previously forward-declared types:
-  - `SpatialReference.h`
-  - `Point.h`
-  - `Geometry.h`
-  - `PartCollection.h`
-  - `ImmutablePartCollection.h`
-  - `AttributeListModel.h`
-  - `QPointer.h`
-  - `QGraphicsScene.h`
-
-### 5. GeometryEngine API Updates
-**Files Modified:**
-- `MathUtils/geometry_engine.cpp`
-- `MapObjectsImpl/basic_path_object_impl.cpp`
-- `Map/measurement_impl.cpp`
-
-**Changes:**
-- `bufferGeodetic(distance, unitId)` → `bufferGeodetic(distance, LinearUnit(unitId))`
-- `distanceGeodetic()` now requires `LinearUnit&` and `AngularUnit&` objects
-
-### 6. Viewshed API Updates (ArcGIS SDK v300)
-**Files Modified:**
-- `EvalApps/Viewshed3D/ViewshedLocation.cpp`
-
-**Changes:**
-- `LocationViewshed` → `ExploratoryLocationViewshed`
-
-### 7. QVariantMap::unite() Removal (Qt6)
-**Files Modified:**
-- `GraphicalObjects/graphical_object_renderer_attributes.cpp`
-
-**Changes:**
-- Replaced `unite()` with iterate/insert pattern
-
-### 8. Geometry Type Safety
-**Files Modified:**
-- `GraphicalObjects/graphical_object_path.cpp`
-
-**Changes:**
-- Added `geometryType()` check before static_cast to Multipart
-
-### 9. QList/QVector Overload Resolution (Qt6)
-**Files Modified:**
-- `MathUtils/path_rasterer.h`
-- `MathUtils/path_rasterer.cpp`
-
-**Changes:**
-- Removed `QList<QPointF>` overload (conflicts with `QVector<QPointF>` in Qt6 where QList=QVector)
-
-### 10. CMake Linker Fixes
-**Files Modified:**
-- `CMakeLists.txt`
-
-**Changes:**
-- Added `Qt6::OpenGLWidgets` to `NGL_TARGET_LINK_LIBRARIES`
-
-### 11. QStringView API
-**Files Modified:**
-- `Symbology/sidc_codec.cpp`
-- `Symbology/sidc_builder.cpp`
-- `Symbology/sidc_builder_base.cpp`
-- `Symbology/symbol_properties.cpp`
-- `SymbologyImpl/symbol_dictionary_impl.cpp`
-
-**Changes:**
-- `slice()` → `sliced()`
-
-### 12. QSortFilterProxyModel Filter API
-**Files Modified:**
-- `SymbologyImpl/base_symbol_model.cpp`
-
-**Changes:**
-- `invalidateFilter()` usage verified correct
-
-### 13. QtConcurrent::run() nodiscard
-**Files Modified:**
-- `SymbologyImpl/symbol_dictionary_impl.cpp`
-
-**Changes:**
-- Removed incorrect `(void)` casts from QtConcurrent::run() calls
-
-### 14. GeometryDimension Operator
-**Files Modified:**
-- `Map/situation_map_utils.h`
-- `Map/situation_map_utils.cpp`
-
-**Changes:**
-- Added GeometryDimension forward declaration
-- Added operator<< for streaming
-
-## Build Warnings (Pre-existing)
-The following warnings exist but are **pre-existing** and not introduced by Qt6 migration:
-- Mismatched new/delete in `RubberbandBase` class (custom operator new)
-- ArcGISQt5Hack provides `std::bad_array_new_length@Qt_5` symbol (may need Qt6 review)
-
-## Verification Results
-
-### Qt6 Deprecated API Scan
-```bash
-grep -rn "Qt::MidButton\|touchPoints\|invalidateFilter\|qAsConst\|foreach" \
-  Lts/Viewer/SituationMap/ --include="*.cpp" --include="*.h"
-```
-**Result: 0 matches** - All deprecated APIs have been addressed.
-
-### Docker Build
-```bash
-./new_docker_build.sh --build-viewer-only --arcgis --no-ctest
-```
-**Result: SUCCESS (exit code 0)**
-
-## Files Modified (Summary)
-| Module | Files Changed | Primary Changes |
-|--------|---------------|-----------------|
-| GraphicalObjects | 9 | ArcGIS includes, Geometry cast fix, QVariantMap |
-| Rubberbands | 14 | QTouchEvent API, QFuture pattern, Qt::MiddleButton |
-| MathUtils | 2 | GeometryEngine API, QList/QVector overload |
-| MapImpl | 1 | ArcGIS include paths |
-| Symbology | 5 | QStringView::sliced() |
-| SymbologyImpl | 2 | QtConcurrent, filter API |
-| Map | 3 | GeometryDimension, measurement units |
-| MapObjectsImpl | 1 | bufferGeodetic() units |
-| EvalApps/Viewshed3D | 1 | QMouseEvent API, ExploratoryLocationViewshed |
-| Tests/EsriMapTouchTest | 2 | QTouchEvent API, Qt::MiddleButton |
-| CMakeLists.txt | 1 | Qt6::OpenGLWidgets |
-
-**Total: ~40 files modified**
-
-## ArcGISQt5Hack Status
-Location: `ArcGISQt5Hack/arcgisqt5hack.cpp`
-
-Provides missing symbol for `typeinfo for std::bad_array_new_length@Qt_5`.
-
-**Current Status:** Builds successfully in Qt6 Docker environment.
-
-**Recommendation:** Review whether this hack is still needed for Qt6 or if an equivalent Qt6 version is required. The symbol name suggests Qt5-specific ABI, but the build succeeds, suggesting either:
-1. The symbol is still compatible
-2. The symbol is no longer needed
-3. The linker resolves it differently in Qt6
-
-## Test Coverage
-Existing test infrastructure preserved:
-- `Tests/EsriMapTouchTest/` - Touch event handling tests
-- `Tests/SitMapTestApp/` - Main test application
-- `Tests/CrashDictSymbol/` - Symbol dictionary tests
-- `Tests/LineOfSightEvaluation/` - LOS calculation tests
-- `Tests/RdeExample_Viewshed/` - Viewshed tests
-
-All test files have been updated for Qt6 API compatibility.
-
-## Compliance with Migration Prompt
-
-### Mandatory Build Variants ✅
-- BUILD_RTI=ON: Supported
-- BUILD_GRANTLEE=ON: Supported
-- BUILD_ARCGIS=ON: Supported and validated
-
-### Preservation Rules ✅
-- Commit 92ad7d468 (removed modules): Preserved - no restoration attempted
-- Commit 1fa789767 (LogViewer): Preserved
-- Commit be912de9d (IDL warnings): Referenced, not blindly replayed
-
-### Docker Validation ✅
-- Builds in official Docker container with Qt 6.10.2
-- Uses new_docker_build.sh validation script
-- No host system builds used for validation
-
-### Qt5 Link Removal ✅
-- No Qt5:: imported targets linked
-- All Qt module references updated to Qt6
-
-## Remaining Recommendations
-
-1. **ArcGISQt5Hack Review**: Determine if Qt6 equivalent is needed or if hack can be removed
-2. **Pre-existing Warnings**: Address mismatched new/delete in RubberbandBase (not migration-blocker)
-3. **Full Test Suite**: Run complete CTest suite when test infrastructure is fully Qt6-ready
-
-## Conclusion
-The SituationMap module migration to Qt6 is **complete and validated**. All Qt6 deprecated APIs have been addressed, ArcGIS SDK v300 integration is functional, and the Docker build completes successfully.
-
----
-*Migration completed: $(date)*
-*Validated with: Qt 6.10.2, ArcGIS Maps SDK v300.0.0*
-*Build script: new_docker_build.sh --build-viewer-only --arcgis --no-ctest*

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_types.h

@@ -189,11 +189,9 @@ enum class RenderingMode
 
 enum class SurfacePlacement
 {
-  DrapedFlat = 4,        ///< DrapedFlat (4) - renamed from Draped in ArcGIS SDK v300
+  Draped,                ///< Draped (0)
-  Absolute = 1,          ///< Absolute (1)
+  Absolute,              ///< Absolute (1)
-  Relative = 2,          ///< Relative (2)
+  Relative               ///< Relative (2)
-  DrapedBillboarded = 0, ///< DrapedBillboarded (0) - new in ArcGIS SDK v300
-  RelativeToScene = 3    ///< RelativeToScene (3) - new in ArcGIS SDK v300
 };
 
 

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/map_impl.cpp

@@ -137,8 +137,8 @@
 #include <QMessageBox>
 
 #include <QtPrintSupport/QPrinter>
-#include <QPageLayout>      // For QPageLayout::Orientation
+#include <QPageLayout>      // Qt6: QPageLayout::Orientation
-#include <QEvent>           // For QEnterEvent
+#include <QEvent>           // Qt6: QEnterEvent (QWidget::enterEvent(QEnterEvent*))
 #include <QFuture>          // 300: exportImageAsync() -> QFuture<QImage>
 #include <QFutureWatcher>   // 300: observe the export QFuture
 #include <QTextTable>
@@ -206,7 +206,7 @@ public:
     m_iconOnHover = icon;
   }
 
-  // QWidget::enterEvent takes QEnterEvent* in Qt6
+  // Qt6: QWidget::enterEvent takes QEnterEvent* (leaveEvent stays QEvent*)
   void enterEvent(QEnterEvent *e) override
   {
     setIcon(m_iconOnHover);
@@ -5686,7 +5686,7 @@ void MapImpl::finishToPdf(const QImage &image,
   printer.setDocName(title);
 
 
-  const QSizeF pageSize = printer.paperRect(QPrinter::Point).size();   // paperRect() requires Unit parameter
+  const QSizeF pageSize = printer.paperRect(QPrinter::Point).size();   // Qt6: paperRect() now requires a Unit
   DEBUG_LOG(m_logger) << LOGFUNCTION << " pageSize=" << pageSize;
 
   const QSizeF drawingSize = pageSize - QSizeF(2 * marginInt, 2 * marginInt) * 1.5;

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

@@ -1,49 +0,0 @@
-#
-# $Id$
-# $HeadURL$
-# $Author$
-#
-
-SET(SRCS_TEST1
-  situation_map_test_main.cpp
-  sit_map.cpp
-
-  log4cxxSituationMapModuleTests.props
-)
-
-SET(HDRS_TEST1
-  situation_map_test_main.h
-  sit_map.h
-)
-
-IF(BUILD_TESTING AND TARGET situationMap)
-   ADD_EXECUTABLE(situationMapModuleTest ${SRCS_TEST1} ${HDRS_TEST1})
-   TARGET_LINK_LIBRARIES(situationMapModuleTest
-     NGLLogger
-     nglapplication
-     LtsCoordTrans
-     advancedSymbology_static
-     situationMapObjects
-     situationMap_static
-     situationMapFunctionDialog
-     ArcGIS::ArcGIS
-     Qt6::Core
-     Qt6::Test
-   )
-
-   ADD_TEST(NAME situationMapModuleTest_NONE     COMMAND $<TARGET_FILE:situationMapModuleTest> none)
-   ADD_TEST(NAME situationMapModuleTest_MIL2525D COMMAND $<TARGET_FILE:situationMapModuleTest> mil2525d)
-
-   SET(LOG4CXX_PROPS_FILE log4cxxSituationMapModuleTests.props)
-   ADD_CUSTOM_COMMAND(TARGET situationMapModuleTest POST_BUILD
-                      COMMAND ${CMAKE_COMMAND}
-                         ARGS -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${LOG4CXX_PROPS_FILE} $<TARGET_FILE_DIR:situationMapModuleTest>/${LOG4CXX_PROPS_FILE}
-                      )
-
-   IF(MSVC)
-      # Configure the template file
-      SET(VS_USER_FILE situationMapTest.vcxproj.user)
-      configure_file( ../SituationMap.vcxproj.user.in ${CMAKE_CURRENT_BINARY_DIR}/${VS_USER_FILE} @ONLY)
-   ENDIF(MSVC)
-
-ENDIF()

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ModuleTests/log4cxxSituationMapModuleTests.props

@@ -1,159 +0,0 @@
-log4j.reset=true
-log4j.rootLogger=WARN, file
-
-# SitMap
-###########################################################
-#log4j.logger.SituationMap.SituationMapTestsMain=DEBUG
-#log4j.logger.SituationMap.SitMap=WARN
-
-# AdvancedSymbology (AdvSymbology)
-###########################################################
-#log4j.logger.AdvSymbology.SymbolDictionary=INFO
-#log4j.logger.AdvSymbology.SymbolDictionaryImpl=INFO
-#log4j.logger.AdvSymbology.Sidc2525Delta=INFO
-
-# SituationMap
-###########################################################
-#log4j.logger.SituationMap.INFO
-#log4j.logger.SituationMap.MapImpl=FATAL
-#log4j.logger.SituationMap.MapSettings=FATAL
-#log4j.logger.SituationMap.MapInitializer=FATAL
-#log4j.logger.SituationMap.LayerFactoryImpl=FATAL
-#log4j.logger.SituationMap.LayerControl=FATAL
-#log4j.logger.SituationMap.CoordTranslationFunctorImpl=FATAL
-#log4j.logger.SituationMap.CoordTranslationThread=FATAL
-#log4j.logger.SituationMap.PositionsTranslated=FATAL
-#log4j.logger.SituationMap.GridImpl=FATAL
-#log4j.logger.SituationMap.ObjectFactory=FATAL
-#log4j.logger.SituationMap.IdGenerator=FATAL
-#log4j.logger.SituationMap.ObjectContainer=FATAL
-#log4j.logger.SituationMap.ObjectContainerCTC=FATAL
-#log4j.logger.SituationMap.OverlayHandlerImpl=FATAL
-#log4j.logger.SituationMap.ViewshedImpl=FATAL
-#log4j.logger.SituationMap.ViewshedBase=FATAL
-
-#log4j.logger.SituationMap.AbstractMapObjectImpl=FATAL
-#log4j.logger.SituationMap.AbstractEffectSimulationImpl=FATAL
-#log4j.logger.SituationMap.OriginTranslated=FATAL
-#log4j.logger.SituationMap.PositionsTranslated=FATAL
-#log4j.logger.SituationMap.AbstractMultiPointMapObjectImpl=FATAL
-#log4j.logger.SituationMap.AbstractSinglePointMapObjectImpl=FATAL
-#log4j.logger.SituationMap.BasicPathObjectImpl=FATAL
-#log4j.logger.SituationMap.IndicationContainer=FATAL
-
-#log4j.logger.SituationMap.PolygonImpl=FATAL
-#log4j.logger.SituationMap.PolylineImpl=FATAL
-#log4j.logger.SituationMap.TextImpl=FATAL
-
-#log4j.logger.SituationMap.AreaFireImpl=FATAL
-#log4j.logger.SituationMap.BiologicalAgentImpl=FATAL
-#log4j.logger.SituationMap.BuildingOutlineImpl=FATAL
-#log4j.logger.SituationMap.ChemicalAgentImpl=FATAL
-#log4j.logger.SituationMap.DangerAreaImpl=FATAL
-#log4j.logger.SituationMap.FunctionalAreaImpl=FATAL
-#log4j.logger.SituationMap.HitLineImpl=FATAL
-#log4j.logger.SituationMap.MapObjectIndicatorImpl=FATAL
-#log4j.logger.SituationMap.MineImpl=FATAL
-#log4j.logger.SituationMap.MineFieldImpl=FATAL
-#log4j.logger.SituationMap.NuclearAgentImpl=FATAL
-#log4j.logger.SituationMap.ParticipantImpl=FATAL
-#log4j.logger.SituationMap.SingleFireImpl=FATAL
-
-#log4j.logger.SituationMap.AbstractGraphicalObject=FATAL
-#log4j.logger.SituationMap.GraphicalObjectEllipse=FATAL
-#log4j.logger.SituationMap.GraphicalObjectPath=FATAL
-#log4j.logger.SituationMap.GraphicalObjectMultiPath=FATAL
-#log4j.logger.SituationMap.GraphicalObjectPictureMarker=FATAL
-#log4j.logger.SituationMap.GraphicalObjectRange=FATAL
-#log4j.logger.SituationMap.GraphicalObjectText=FATAL
-#log4j.logger.SituationMap.TacticalAppearance=FATAL
-#log4j.logger.SituationMap.MessageBase=FATAL
-
-#log4j.logger.SituationMap.EventDispatcher=FATAL
-#log4j.logger.SituationMap.Rubberband=FATAL
-#log4j.logger.SituationMap.RubberbandRectangle=FATAL
-#log4j.logger.SituationMap.RubberbandDrawablesAndHandles=FATAL
-#log4j.logger.SituationMap.RubberbandFrameHandle=FATAL
-#log4j.logger.SituationMap.RubberbandPointHandle=FATAL
-#log4j.logger.SituationMap.RubberbandStateSelect=FATAL
-
-# SituationMap-SideBar
-###########################################################
-#log4j.logger.SituationMap.SideBar=FATAL
-#log4j.logger.SituationMap.SideBarItem=FATAL
-#log4j.logger.SituationMap.SideBarModel=FATAL
-
-
-
-# Appnd_File
-###########################################################
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.MaxFileSize=1MB
-log4j.appender.file.MaxBackupIndex=9
-log4j.appender.file.file=${LOG4QT_LOGDIR}/${LOG4QT_USER}_SituationMap.log
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d %-5p %c |#| %m (%.50F:%L) %n
-
-
-# Appnd_Console
-###########################################################
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern= %d %-5p %c{1} |#| %m (%-.30F:%L) %n
-
-#log4j.appender.stdout.layout.ConversionPattern= %d %-5p %-30c |#| %m (%-.30F:%L) %n
-
-
-# Appnd_Syslog
-###########################################################
-log4j.appender.syslog=org.apache.log4j.SyslogAppender
-log4j.appender.syslog.Threshold=ERROR
-log4j.appender.syslog.SysLogHost=localhost
-log4j.appender.syslog.Facility=LOCAL7
-log4j.appender.syslog.layout=org.apache.log4j.PatternLayout
-log4j.appender.syslog.layout.ConversionPattern= %-4r %-5p %c %x - %m
-log4j.appender.syslog.LevelRangeFilter.AcceptOnMatch=true
-log4j.appender.syslog.LevelRangeFilter.LevelMin=INFO
-log4j.appender.syslog.LevelRangeFilter.LevelMax=FATAL
-
-
-###########################################################
-###########################################################
-###########################################################
-# 1) Available Levels in LOG4CXX Version 0.10.0:
-# TRACE,
-# DEBUG,
-# INFO,
-# WARN,
-# ERROR
-# FATAL
-#
-# d = date/time
-# p = priority (Level)
-# c = category/channel
-# m = message
-# F = file
-# L = line
-# n = platform dependent line separator character or characters.
-# ....
-#
-# Examples for console:
-# a)
-# %d %p %c #%m# (%.50F:%L)%n
-# date/time
-#    priority
-#       category/channel
-#          #message#
-#                (Maximal 50Character des Filename von rechts:Line)
-#                       line separator
-#
-# b)
-# %d (%.15F:%L) %-5p %c |#| %m%n
-# date/time
-#    (Maximal 15Character des Filename von rechts:Line)
-#               priority, Right pad with spaces if the priority name is less than 5 characters long.
-#                    category/channel
-#                           message
-#                             line separator
-#
-

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ModuleTests/sit_map.cpp

@@ -1,347 +0,0 @@
-/**
-  * @RDE_HEADER@
-  * Moduletest
-  * $Id$
-  * $HeadURL$
-  * $Author$
-  */
-
-// Own
-#include "sit_map.h"
-
-#include <ngltools/ngltools_filesystem.h>
-
-#include <Map/map.h>
-//#include <Map/layer_factory.h>
-#include <Map/grid.h>
-#include <Map/map_initializer.h>
-#include <Map/situation_map_utils.h>
-#include <Symbology/symbol_dictionary.h>
-
-#include <Map/object_factory.h>
-#include <MapObjectsImpl/polygon_impl.h>
-#include <MapObjectsImpl/polyline_impl.h>
-#include <MapObjectsImpl/text_impl.h>
-#include <MapObjectsImpl/area_fire_impl.h>
-#include <MapObjectsImpl/biological_agent_impl.h>
-#include <MapObjectsImpl/chemical_agent_impl.h>
-#include <MapObjectsImpl/cube_impl.h>
-#include <MapObjectsImpl/building_outline_impl.h>
-#include <MapObjectsImpl/danger_area_impl.h>
-#include <MapObjectsImpl/functional_area_impl.h>
-#include <MapObjectsImpl/geo_image_impl.h>
-#include <MapObjectsImpl/hit_line_impl.h>
-#include <MapObjectsImpl/map_object_indicator_impl.h>
-#include <MapObjectsImpl/mine_impl.h>
-#include <MapObjectsImpl/mine_field_impl.h>
-#include <MapObjectsImpl/nine_liner_impl.h>
-#include <MapObjectsImpl/nuclear_agent_impl.h>
-#include <MapObjectsImpl/participant_impl.h>
-#include <MapImpl/sidc_symbol_impl.h>
-#include <MapObjectsImpl/single_fire_impl.h>
-//#include <MapObjectsImpl/single_fire_central_impl.h>
-
-#include <FunctionDialog/function_dialog.h>
-
-
-// Qt
-#include <QApplication>
-#include <QTimer>
-#include <QPushButton>
-#include <QGridLayout>
-
-
-
-
-class myMapInitializer : public SituationMap::MapInitializer
-{
-  Q_OBJECT
-
-  using BaseClass = SituationMap::MapInitializer;
-
-public:
-
-  explicit myMapInitializer(SituationMap::Map            &map
-                            , SituationMap::MapSettings  &mapSettings
-                            , const QString              &debugName
-                            , QObject       *parent = nullptr)
-    : BaseClass(map, mapSettings, debugName, parent) {}
-
-  bool initializeObjectFactory() override
-  {
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::MapObjectIndicator), new SituationMap::GenericObjectFactory<SituationMap::MapObjectIndicatorImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::Cube),               new SituationMap::GenericObjectFactory<SituationMap::CubeImpl>());
-
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::Polygon),         new SituationMap::GenericObjectFactory<SituationMap::PolygonImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::Polyline),        new SituationMap::GenericObjectFactory<SituationMap::PolylineImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::Text),            new SituationMap::GenericObjectFactory<SituationMap::TextImpl>());
-
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::Participant),     new SituationMap::GenericObjectFactory<SituationMap::ParticipantImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::AreaFire),        new SituationMap::GenericObjectFactory<SituationMap::AreaFireImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::BiologicalAgent), new SituationMap::GenericObjectFactory<SituationMap::BiologicalAgentImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::ChemicalAgent),   new SituationMap::GenericObjectFactory<SituationMap::ChemicalAgentImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::BuildingOutline), new SituationMap::GenericObjectFactory<SituationMap::BuildingOutlineImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::DangerArea),      new SituationMap::GenericObjectFactory<SituationMap::DangerAreaImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::FunctionalArea),  new SituationMap::GenericObjectFactory<SituationMap::FunctionalAreaImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::GeoImage),        new SituationMap::GenericObjectFactory<SituationMap::GeoImageImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::HitLine),         new SituationMap::GenericObjectFactory<SituationMap::HitLineImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::Mine),            new SituationMap::GenericObjectFactory<SituationMap::MineImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::MineField),       new SituationMap::GenericObjectFactory<SituationMap::MineFieldImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::NineLiner),       new SituationMap::GenericObjectFactory<SituationMap::NineLinerImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::NuclearAgent),    new SituationMap::GenericObjectFactory<SituationMap::NuclearAgentImpl>());
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::SingleFire),      new SituationMap::GenericObjectFactory<SituationMap::SingleFireImpl>());
-//    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::SingleFireCentral), new SituationMap::GenericObjectFactory<SituationMap::SingleFireCentralImpl>());
-
-    SituationMap::ObjectFactory::registerMe(typeid(SituationMap::SidcSymbol),      new SituationMap::GenericObjectFactory<SituationMap::SidcSymbolImpl>());
-
-    return true;
-  } // initializeObjectFactory()
-
-  // overload to support tpk-Files/BasemapBuiltIn
-  bool initializeCoordTranslationFunctor() override
-  {
-    if (m_map.layerFactory().isUsingBaseMapBuiltIn())
-    {
-      int wkid = 102100;
-      NOTICE_LOG(m_logger) << LOGFUNCTION << "\e[31m !!! using BaseMapBuiltIn -> wkId=" << wkid << "\e[0m";
-
-      m_map.initCoordTranslationFunctor();
-      return true;
-    }
-    return BaseClass::initializeCoordTranslationFunctor();
-  }
-
-
-  AdvancedSymbology::SymbologyType symbologyType() const override
-  {
-    return m_symbologyType;
-  } // symbologyType
-
-  void setSymbologyType(AdvancedSymbology::SymbologyType symbologyType)
-  {
-    m_symbologyType = symbologyType;
-  }
-
-
-protected slots:
-
-  void onMapReady() override
-  {
-
-    // using center and scale:
-    m_map.setCenterPoint(QPointF(92750, 80525));  // QPointF(92750, 80525) -> Rennplatz - Bremen
-    m_map.setScale(3000000);                      // 3000000 -> Lower Saxony
-
-    // instead of "center and scale" it is possible to set an extent
-    // double xmin, double ymin, double xmax, double ymax
-    // m_map.setExtent(-200000, -200000, 300000, 300000);
-
-
-    // minMaxScale is optional:
-    // m_map.setMinScale(10000000);
-    // m_map.setMaxScale(100);
-  }
-
-protected:
-  AdvancedSymbology::SymbologyType m_symbologyType = AdvancedSymbology::SymbologyType::APP6B;
-
-}; // myMapInitializer
-
-
-using namespace SituationMap;
-
-class SitMap::Private
-{
-public:
-  Private()   = default;
-  ~Private()  = default;
-
-  // map
-  AdvancedSymbology::SymbologyType m_symbologyType;
-  SituationMap::Map              *m_map = nullptr;
-
-  // admin
-  QGridLayout                    *m_mainLayout       = nullptr;
-  QPushButton                    *m_pbDestroyMap     = nullptr;
-  QPushButton                    *m_pbQuit          = nullptr;
-
-  QTimer                         *m_getRotationTimer = nullptr;
-
-}; // class SitMap::Private
-//-----------------------------------------------------------------------------
-
-SitMap::SitMap(AdvancedSymbology::SymbologyType symbologyType, QWidget *parent)
-  : QDialog(parent)
-  , m_logger(SituationMap::getLogger("SitMap"))
-  , d(new Private)
-{
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-
-  this->setObjectName(QLatin1String("SitMap-Widget"));
-
-  d->m_symbologyType = symbologyType;
-  d->m_mainLayout = new QGridLayout(this);
-  d->m_mainLayout->setObjectName(QLatin1String("layout"));
-
-  //-----------------------------------
-  // Buttons
-  //-----------------------------------
-  d->m_pbDestroyMap = new QPushButton(QLatin1String("Destroy Map"));
-  d->m_mainLayout->addWidget(d->m_pbDestroyMap, 0, 0);
-  connect(d->m_pbDestroyMap, &QPushButton::clicked, this, &SitMap::onCreateDestroyClicked);
-
-
-  //-----------------------------------
-  // Map
-  //-----------------------------------
-  createMap();
-
-  {
-    QGridLayout *bottomLayout = new QGridLayout();
-    bottomLayout->setObjectName(QLatin1String("bottomLayout"));
-    d->m_mainLayout->addLayout(bottomLayout, 2, 0);
-
-    d->m_pbQuit = new QPushButton(QLatin1String("Quit"));
-    connect(d->m_pbQuit, &QPushButton::clicked, [ = ]()
-    {
-      QCoreApplication::quit();
-    });
-    bottomLayout->addWidget(d->m_pbQuit, 0, 0);
-
-    // tbc
-
-  }
-
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-}
-
-SitMap::~SitMap()
-{
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-  delete d->m_map;
-  delete d;
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-}
-
-bool SitMap::isReady()
-{
-  return d->m_map->isReady();
-}
-
-SituationMap::Map *SitMap::map()
-{
-  return d->m_map;
-}
-
-void SitMap::onCreateDestroyClicked()
-{
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-  static bool destroy = false;
-  destroy = !destroy;
-  if (destroy)
-  {
-    d->m_pbDestroyMap->setText(QLatin1String("Create Map"));
-    d->m_getRotationTimer->stop(); // to avoid slot being called
-    d->m_map->deleteLater();
-  }
-  else
-  {
-    d->m_pbDestroyMap->setText(QLatin1String("Destroy Map"));
-    createMap();
-  }
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-}
-
-void SitMap::createMap()
-{
-  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
-
-  // 1. Map
-  d->m_map = SituationMap::Map::create(this);
-
-  connect(d->m_map, &SituationMap::Map::mapReady, this, [this]()
-  {
-
-    this->update();           // to fix redraw problem
-
-    DEBUG_LOG(m_logger) << " ===== emitting mapReady";
-    emit mapReady();
-
-    // Timer
-    d->m_getRotationTimer = new QTimer(this);
-    connect(d->m_getRotationTimer, &QTimer::timeout, this, [this]()
-    {
-      DEBUG_LOG(m_logger) << " get rotationDegree of=" << d->m_map->rotation();
-    });
-    d->m_getRotationTimer->setSingleShot(true);
-    d->m_getRotationTimer->start(2000);
-  });
-
-  connect(d->m_map, &SituationMap::Map::mapReadyAndSymbolDictionaryLoaded, this, [this]()
-  {
-    DEBUG_LOG(m_logger) << " ===== emitting mapReadyAndSymbolDictionaryLoaded";
-    emit mapReadyAndSymbolDictionaryLoaded();
-  });
-
-
-  // e.g. TDS-build/share/Lts/situation_map/situation_map_defaults.ini
-  QString initFilePath = NGL::findFile(NGL::FileType::ConfigFile, QStringLiteral("situation_map_defaults.ini"));
-
-  if (initFilePath.isEmpty())
-  {
-    FATAL_LOG(m_logger) << " initFilePath " << initFilePath;
-    abort();
-  }
-
-  SituationMap::MapSettings *mapSettings = new SituationMap::MapSettings(initFilePath, d->m_map);
-  myMapInitializer *mapInitializer = new myMapInitializer(*d->m_map, *mapSettings, QLatin1String("ModuleTest"), d->m_map);
-
-
-  // Take SymbologyType from argv not from ini file:
-  AdvancedSymbology::SymbologyType symbologyTypeArgv = d->m_symbologyType;
-  mapInitializer->setSymbologyType(symbologyTypeArgv);
-
-
-  if (mapInitializer->hasErrors())
-  {
-    FATAL_LOG(m_logger) << LOGFUNCTION << " MapInitializer-filename='" << mapInitializer->filename()
-                        << "'' has following errors: "
-                        << " exists = " << mapInitializer->exists()
-                        << " accessError = " << mapInitializer->accessError()
-                        << " formatError = " << mapInitializer->formatError();
-    return;
-  }
-  else
-  {
-    if (mapInitializer->initMap())
-    {
-      INFO_LOG(m_logger) << LOGFUNCTION << " MapInitializer::initMap() ok";
-    }
-    else
-    {
-      ERROR_LOG(m_logger) << LOGFUNCTION << " MapInitializer::initMap() failed";
-    }
-  }
-
-  DEBUG_LOG(m_logger) << LOGFUNCTION << " GridLevelCount=" << d->m_map->grid().levelCount();
-
-  // BasePoint, extent, rotation
-  connect(d->m_map, &SituationMap::Map::extentChanged, this, [ = ]()
-  {
-    DEBUG_LOG(m_logger) << LOGFUNCTION << " extent changed: ";
-  });
-
-
-  // Add widget
-  d->m_mainLayout->addWidget(d->m_map, 1, 0);
-
-  // 50. turn over to application (if required):
-
-  // Create FunctionDialog:
-  SituationMap::FunctionDialog::addButtonToMap(d->m_map);
-
-
-  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
-}
-
-#include "sit_map.moc"

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ModuleTests/sit_map.h

@@ -1,58 +0,0 @@
-/**
-  * @RDE_HEADER@
-  * Moduletest
-  * $Id$
-  * $HeadURL$
-  * $Author$
-  */
-
-#pragma once
-
-// Qwn
-#include <Common/situation_map_logging.h>
-
-
-namespace SituationMap
-{
-class Map;
-}
-
-namespace AdvancedSymbology
-{
-enum class SymbologyType;
-}
-
-
-// Qt
-#include <QDialog>
-
-class SitMap : public QDialog
-{
-  Q_OBJECT
-
-public:
-  SitMap(AdvancedSymbology::SymbologyType symbologyType, QWidget *parent = nullptr);
-  virtual ~SitMap();
-
-  virtual bool isReady();
-
-  SituationMap::Map *map();
-
-
-signals:
-  void mapReady();
-  void mapReadyAndSymbolDictionaryLoaded();
-
-public slots:
-  void onCreateDestroyClicked();
-  void createMap();
-
-
-private:
-  SituationMap::LOGGER_T m_logger;      ///< Interface of the Logging-Facility
-
-  class Private;
-  Private *d = nullptr;
-
-};
-