Adds further migration results and moves generated tests in

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

@@ -75,10 +75,11 @@ OPTION(BUILD_PLUGINS_PARTICIPANT_ORG_CHART "Build ParticipantOrgChart (requires
 OPTION(BUILD_PLUGINS_MSDL "Build MSDL module (requires Qt6 XmlPatterns)" OFF)
 OPTION(BUILD_PLUGINS_SAAB "Build Saab module (requires Qt6 XmlPatterns)" OFF)
 OPTION(BUILD_RTI "Build RTI Connext DDS dependent modules" OFF)
+OPTION(BUILD_ARCGIS "Build ArcGIS SDK dependent modules" OFF)
 OPTION(BUILD_FILTERMANAGEMENT "Build FilterManagement plugins (temporarily disabled for migration)" OFF)
 OPTION(BUILD_CODIFICATION "Build CodificationManagement plugins (requires KDReports)" OFF)
 OPTION(BUILD_GRANTLEE "Build CodeGen Grantlee templates (requires Grantlee5/Qt5)" OFF)
-OPTION(BUILD_LTSWEBSOCKET "Build LtsWebSocket module (requires NGLLogger)" OFF)
+OPTION(BUILD_LTSWEBSOCKET "Build LtsWebSocket module (requires NGLLogger)" ON)
 
 IF(WIN32)
   SET(EXTERNAL_LIBRARY_DIR "C:/Development/Projekte/SituationMap/ExtFw" CACHE STRING "Library dir with all external dependencies")
@@ -94,6 +95,7 @@ CONFIGURE_FILE(CTestCustom.ctest ${CMAKE_BINARY_DIR}/CTestCustom.ctest COPYONLY)
 CONFIGURE_FILE(lts-cc.conf ${CMAKE_BINARY_DIR}/lts-cc.conf.distrib COPYONLY)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+INCLUDE(FindLibraryWithDebug)
 # Add bundled GeographicLib cmake config to find modern targets (GeographicLib::GeographicLib_SHARED)
 LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/include/GeographicLib/lib/cmake")
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)

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

@@ -16,7 +16,7 @@ else()
 endif()
 
 # Add only existing subdirectories to allow partial checkouts / incremental migration
-set(LTS_SUBDIRS Tools Application Common DDS Plugins Projects Proxies Services Viewer)
+set(LTS_SUBDIRS Tools Application Common DDS Services Proxies Plugins Viewer Projects)
 foreach(dir IN LISTS LTS_SUBDIRS)
   if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dir}")
   # Use guarded add so top-level MIGRATE_MODULE can restrict which Lts subdirs are included
@@ -43,4 +43,14 @@ ENDIF()
 # Ensure codegen macros are available before calling CODEGEN_* helpers
 INCLUDE(MacroCodeGenIdl)
 
+# Add stub headers for non-RTI/non-FilterManagement builds
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/AudioVideoManagement/)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/NGLLogger/)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/LtsSession/)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/TopicEditorBase/)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/OperatorManagement/)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/LtsScriptTimeline/)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/LtsUtilsGuiDds/)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/Services/PresentationManagement/)
+
 CODEGEN_WRITE_SERVICEFILE_INFO()

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

@@ -35,7 +35,9 @@ ADD_SUBDIRECTORY(LtsNotification)
 ADD_SUBDIRECTORY(LtsTimeline)
 ADD_SUBDIRECTORY(LtsPrinting)
 ADD_SUBDIRECTORY(LtsSerialPortQuerry)
-ADD_SUBDIRECTORY(LtsScriptTimeline)
+IF(BUILD_RTI)
+  ADD_SUBDIRECTORY(LtsScriptTimeline)
+ENDIF()
 IF(BUILD_LTSWEBSOCKET)
 ADD_SUBDIRECTORY(LtsWebSocket)
 ENDIF()

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

@@ -27,7 +27,7 @@ SET(LtsMultiMonitor_SRCS
   lts_screen_wide.cpp
 )
 
-IF(BUILD_RTI)
+# LtsMultiMonitor is needed by AvmShared regardless of BUILD_RTI
 NGL_ADD_LIBRARY2(WS LtsMultiMonitor SHARED ${LtsMultiMonitor_SRCS})
 
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsMultiMonitor
@@ -35,6 +35,12 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsMultiMonitor
     ${CMAKE_CURRENT_SOURCE_DIR}/../
 )
 
+NGL_TARGET_INCLUDE_DIRECTORIES(LtsMultiMonitor
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${PROJECT_SOURCE_DIR}/include/LtsUtilsGuiDds
+)
+
 NGL_TARGET_LINK_LIBRARIES(LtsMultiMonitor
   PUBLIC
     Qt6::Core
@@ -48,4 +54,3 @@ NGL_TARGET_LINK_LIBRARIES(LtsMultiMonitor
 )
 
 NGL_INSTALL_TARGET(LtsMultiMonitor)
-ENDIF(BUILD_RTI)

qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_dummy_widget.cpp

@@ -1,6 +1,6 @@
 #include "lts_dummy_widget.h"
 
-#include <LtsUtilsGui/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
+#include <LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
 #include <QDebug>
 #include <QEvent>
 #include <QIcon>

qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/lts_magic_corner.cpp

@@ -1,6 +1,6 @@
 #include "lts_magic_corner.h"
 
-#include <LtsUtilsGui/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
+#include <LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
 #include <QDebug>
 #include <QHBoxLayout>
 #include <QIcon>

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

@@ -11,8 +11,6 @@ SET(LtsNoti_SRCS
   lts_notification.cpp
   lts_notification_ctl.h
   lts_notification_ctl.cpp
-
-  lts_notification_export.h
 )
 
 NGL_ADD_LIBRARY2(WS LtsNotification SHARED ${LtsNoti_SRCS})
@@ -20,6 +18,7 @@ NGL_ADD_LIBRARY2(WS LtsNotification SHARED ${LtsNoti_SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsNotification
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
 NGL_TARGET_LINK_LIBRARIES(LtsNotification

qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "ltsnotification_export.h"
+#include "lts_notification_export.h"
 
 #include <QList>
 #include <QObject>

qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/lts_notification_ctl.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "ltsnotification_export.h"
+#include "lts_notification_export.h"
 
 #include <QIcon>
 #include <QList>

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

@@ -25,7 +25,6 @@ SET(LtsProjectionWorkstation_SRCS
   WebSocket/message_factory.cpp
 )
 
-IF(BUILD_RTI)
 NGL_ADD_LIBRARY2(WS LtsProjectionWorkstation SHARED ${LtsProjectionWorkstation_SRCS})
 
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsProjectionWorkstation
@@ -46,4 +45,3 @@ NGL_TARGET_LINK_LIBRARIES(LtsProjectionWorkstation
 )
 
 NGL_INSTALL_TARGET(LtsProjectionWorkstation)
-ENDIF(BUILD_RTI)

qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/lts_projection_workstation.cpp

@@ -10,7 +10,7 @@
 #include <QGuiApplication>
 #include <QTimer>
 #include <QUuid>
-#include <QWebSocket>
+#include <QtWebSockets/QWebSocket>
 #include <nglsettings/nglsettings_connections.h>
 #include <utility>
 
@@ -41,7 +41,8 @@ bool LtsProjectionWorkstation::hasInstance()
 }
 
 LtsProjectionWorkstation::LtsProjectionWorkstation(QObject* parent)
-    : QObject(parent), m_messageFactory(new MessageFactory(this, m_logger)),
+    : QObject(parent), m_logger(getLogger("LtsProjectionWorkstation")),
+      m_messageFactory(new MessageFactory(this, m_logger)),
       m_webSocketServer(new LtsWebSocket::LtsWebSocketServer(m_messageFactory, this)), m_pendingLoginRequest(nullptr),
       m_vncManager(new VncServerManager(m_logger, this))
 {

qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/vnc_server_manager.cpp

@@ -144,7 +144,7 @@ void VncServerManager::slotReadStandardOutput()
         WARNING_LOG(m_logger) << "Could not retrieve port information from stdout of " << p->program();
         return;
     }
-    const quint16 port = match.capturedRef(1).toInt();
+    const quint16 port = match.captured(1).toInt();
     if (port == 0)
         return;
     for (VncScreen& screen : m_vncScreens)

qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/ltsscripttimeline_export.h

@@ -0,0 +1,12 @@
+#ifndef LTSSCRIPTTIMELINE_EXPORT_H
+#define LTSSCRIPTTIMELINE_EXPORT_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(LTSSCRIPTTIMELINE_LIBRARY)
+#  define LTSSCRIPTTIMELINE_EXPORT Q_DECL_EXPORT
+#else
+#  define LTSSCRIPTTIMELINE_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // LTSSCRIPTTIMELINE_EXPORT_H

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

@@ -30,25 +30,22 @@ ENDIF()
 
 
 
-# LtsSession
+# LtsSession (RTI dependencies optional)
 SET(ltssession_SRCS
-  lts_session_manager.h
-  lts_session_manager.cpp
   lts_session.h
   lts_session.cpp
   lts_session_lock_handler.h
+  lts_session_manager.h
+  lts_session_manager.cpp
+  lts_session_lock_handler.cpp
 )
 
-# Only include lock_handler implementation when RTI is available
-# When BUILD_RTI=OFF, stub header provides inline implementations
-if(BUILD_RTI)
-  list(APPEND ltssession_SRCS lts_session_lock_handler.cpp)
-endif()
-
 NGL_ADD_LIBRARY2(WS LtsSession SHARED ${ltssession_SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsSession
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_CURRENT_BINARY_DIR}/../
+    ${CMAKE_CURRENT_SOURCE_DIR}/../LtsUtils/LtsUtilsGui
 )
 
 NGL_TARGET_LINK_LIBRARIES(LtsSession
@@ -75,6 +72,7 @@ IF(BUILD_RTI)
       ddsconnector
     PUBLIC
       LtsSessionDataDds
+      RTI::nddscore
   )
 ENDIF()
 

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

@@ -1,3 +1,4 @@
+#ifdef BUILD_RTI
 /**
  * @RDE_HEADER@
  * Manages all the Sessions
@@ -234,3 +235,4 @@ LtsSession* LtsSessionManager::getSession(IDL::PartitionType partitionType, int
 }
 
 } // namespace LtsSession
+#endif // BUILD_RTI

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

@@ -29,7 +29,7 @@ QPixmap getMinLimitIndicator()
     triangle << QPoint(10, 10);
     triangle << QPoint(4, 5);
     QPainter painter(&pixmap);
-    painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+    painter.setRenderHints(QPainter::RenderHint::Antialiasing | QPainter::RenderHint::SmoothPixmapTransform);
     painter.setPen(QGuiApplication::palette().color(QPalette::Text));
     painter.setBrush(QBrush(QGuiApplication::palette().color(QPalette::Text)));
     painter.drawLine(1, 0, 1, 10);
@@ -47,7 +47,7 @@ QPixmap getMaxLimitIndicator()
     triangle << QPoint(0, 10);
     triangle << QPoint(6, 5);
     QPainter painter(&pixmap);
-    painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+    painter.setRenderHints(QPainter::RenderHint::Antialiasing | QPainter::RenderHint::SmoothPixmapTransform);
     painter.setPen(QGuiApplication::palette().color(QPalette::Text));
     painter.setBrush(QBrush(QGuiApplication::palette().color(QPalette::Text)));
     painter.drawLine(10, 0, 10, 10);
@@ -355,7 +355,7 @@ void TimelineHeaderView::paintSection(QPainter* painter, const QRect& rect, int
     if (logicalIndex == Section::eActuator)
     {
         painter->save();
-        painter->setRenderHints(QPainter::TextAntialiasing | QPainter::HighQualityAntialiasing);
+        painter->setRenderHints(QPainter::TextAntialiasing | QPainter::RenderHint::Antialiasing);
         painter->setPen(backgroundColor());
         painter->setBrush(QBrush(backgroundColor()));
         painter->drawRect(rect);
@@ -373,7 +373,7 @@ void TimelineHeaderView::paintSection(QPainter* painter, const QRect& rect, int
     painter->setClipping(true);
     painter->setClipRect(rect);
     painter->setFont(m_font);
-    painter->setRenderHints(QPainter::TextAntialiasing | QPainter::HighQualityAntialiasing);
+    painter->setRenderHints(QPainter::TextAntialiasing | QPainter::RenderHint::Antialiasing);
     painter->setPen(backgroundColor());
     painter->setBrush(backgroundColor());
     painter->drawRect(rect);

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

@@ -14,8 +14,8 @@ namespace LtsTimeline
 
 TimelineModel::TimelineModel(TimelineView *view, QObject *parent)
   : QAbstractItemModel(parent)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Timeline.TimelineModel"))
   , m_view(view)
-  .getNGLLogger("Timeline.TimelineModel"))
 {
     m_rootTrack.m_id = nextFreeTrackId();
     m_trackCache.insert(std::pair<int, Track*>(m_rootTrack.m_id, &m_rootTrack));

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

@@ -187,7 +187,6 @@ class LTSTIMELINE_EXPORT TimelineModel : public QAbstractItemModel
     }
 
   protected:
-    NGL::INGLLogger& m_logger;
 
     ItemPtrNCVRef _itemNCV(Track& track, int id) noexcept(false)
     {

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

@@ -25,12 +25,12 @@ const int TimelineView::s_textHeight = 20;
 
 TimelineView::TimelineView(QWidget *parent)
   : QTreeView(parent)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Timeline.TimelineView"))
   , m_header(new TimelineHeaderView(this))
   , m_dragHandler(new TimelineViewDragHandler(this))
   , m_resizeHandler(new TimelineViewResizeHandler(this))
   , m_selectHandler(new TimelineViewSelectHandler(this))
   , m_trackHandler(new TimelineViewTrackHandler(this))
-  .getNGLLogger("Timeline.TimelineView"))
 {
     setAlternatingRowColors(true);
     setEditTriggers(QAbstractItemView::NoEditTriggers);
@@ -378,13 +378,13 @@ void TimelineView::mouseDoubleClickEvent(QMouseEvent* event)
 
 void TimelineView::mouseMoveEvent(QMouseEvent* event)
 {
-    m_cursorPosition = event->pos();
+    m_cursorPosition = event->position().toPoint();
 
-    const QModelIndex index(indexAt(event->pos()));
+    const QModelIndex index(indexAt(event->position().toPoint()));
 
     if (m_header)
     {
-        m_header->setHoverPosition(isCursorWithinRange(event->pos()) ? event->pos().x() : -1);
+        m_header->setHoverPosition(isCursorWithinRange(event->position().toPoint()) ? event->position().toPoint().x() : -1);
         if (m_header->mouseHandler()->isBusy())
         {
             m_header->mouseHandler()->mouseMoveEvent(event);
@@ -440,10 +440,10 @@ void TimelineView::mouseMoveEvent(QMouseEvent* event)
     try
     {
         Track& track = m_timelineModel->track(index.data().toInt());
-        Item& item = track.itemAt(toTime(event->pos().x()));
+        Item& item = track.itemAt(toTime(event->position().toPoint().x()));
         int startPos = toPixel(item.startTime());
         int endPos = toPixel(item.startTime() + item.duration());
-        if (endPos - startPos < 15 || (startPos + 5 < event->pos().x() && event->pos().x() < endPos - 5))
+        if (endPos - startPos < 15 || (startPos + 5 < event->position().toPoint().x() && event->position().toPoint().x() < endPos - 5))
             setCursor(QCursor(Qt::ArrowCursor));
         else
             setCursor(QCursor(Qt::SizeHorCursor));
@@ -466,7 +466,7 @@ void TimelineView::mousePressEvent(QMouseEvent* event)
             return;
         }
 
-    const QModelIndex index = indexAt(event->pos());
+    const QModelIndex index = indexAt(event->position().toPoint());
     if (index.column() == Section::eActuator)
     {
         QTreeView::mousePressEvent(event);
@@ -493,7 +493,7 @@ void TimelineView::mousePressEvent(QMouseEvent* event)
         }
 
         if (event->button() == Qt::RightButton)
-            emit customContextMenuRequested(event->pos());
+            emit customContextMenuRequested(event->position().toPoint());
     }
 }
 
@@ -556,7 +556,7 @@ void TimelineView::keyPressEvent(QKeyEvent* event)
 
 void TimelineView::wheelEvent(QWheelEvent* event)
 {
-    if (event->pos().y() <= m_header->geometry().bottom())
+    if (event->position().toPoint().y() <= m_header->geometry().bottom())
         m_header->wheelEvent(event);
     else if (QGuiApplication::queryKeyboardModifiers() == Qt::ControlModifier)
     {

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

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

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

@@ -6,8 +6,7 @@
 # Created by Mike Wille, SLSE, 2016-09-19
 #
 
-IF(BUILD_RTI)
+# LtsUtilsGuiDds is needed by LtsMultiMonitor regardless of BUILD_RTI
-  ADD_SUBDIRECTORY(LtsUtilsGuiDds)
+ADD_SUBDIRECTORY(LtsUtilsGuiDds)
-ENDIF()
 ADD_SUBDIRECTORY(ConnectDialog)
 ADD_SUBDIRECTORY(StyleManager)

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

@@ -13,25 +13,23 @@ SET(SRCS
   request_helper.h
 )
 
-NGL_ADD_LIBRARY2(WS LtsUtilsGuiDds SHARED ${SRCS})
+NGL_ADD_LIBRARY2(WS SV AAR HLA LtsUtilsGuiDds SHARED ${SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsGuiDds
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(LtsUtilsGuiDds
-  PRIVATE
+  PUBLIC
     LtsUtilsCoreHeaderOnly
     LtsWidgets
     Qt6::Gui
     Qt6::Widgets
     Qt6::Svg
-  PUBLIC
-    Qt6::Core
-    ddscore
 )
+IF(BUILD_RTI)
+  TARGET_LINK_LIBRARIES(LtsUtilsGuiDds PUBLIC ddscore)
 ENDIF(BUILD_RTI)
 NGL_TARGET_COMPILE_DEFINITIONS(LtsUtilsGuiDds
   PUBLIC

qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "ltsutilsguidds_export.h"
+#include <LtsUtilsCore/ltsutilscore_export.h>
 
 #include <QSize>
 #include <QString>

qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/ltsutilsdds_export.h

@@ -6,5 +6,7 @@
 
 #define LTSUTILSDDS_EXPORT
 #define LTSUTILSDDS_NO_EXPORT
+#define LTSUTILSGUIDDS_EXPORT
+#define LTSUTILSGUIDDS_NO_EXPORT
 
 #endif // LTSUTILSDDS_EXPORT_H

qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.cpp

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

qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h

@@ -11,25 +11,20 @@
 #endif
 
 #include <Core/core_types.h>
-#include <DDS/Core/core.hpp>
 #include <QObject>
 #include <QPair>
 #include <QVector>
 #include <functional>
+#include <optional>
+
+// BUILD_RTI wird immer definiert sein (ON oder OFF)
+// Type alias für FunctionReply - immer Core::FunctionReply verwenden
+// Bei BUILD_RTI=ON wird in der .cpp auf dds::core::Reference gecastet
+using FunctionReplyType = Core::FunctionReply;
 
 namespace LtsUtils
 {
 
-template <typename T> dds::core::optional<T> toOptional(T inVal)
-{
-    return inVal != T() ? dds::core::optional<T>(inVal) : dds::core::optional<T>();
-}
-
-template <typename T> dds::core::optional<T> optional()
-{
-    return dds::core::optional<T>();
-}
-
 class LTSUTILSGUIDDS_INTERNAL_EXPORT RequestHelper : public QObject
 {
     Q_OBJECT
@@ -54,20 +49,20 @@ class LTSUTILSGUIDDS_INTERNAL_EXPORT RequestHelper : public QObject
     }
 
     void addRequest(const std::function<int64_t()>& requestFunction,
-                    const std::function<void(const Core::FunctionReply& baseReply)>& baseReplyHandler = nullptr);
+                    const std::function<void(const FunctionReplyType& baseReply)>& baseReplyHandler = nullptr);
     bool startRequests();
 
     bool
     startSingleRequest(const std::function<int64_t(void)>& requestFunction,
-                       const std::function<void(const Core::FunctionReply& baseReply)>& baseReplyHandler = nullptr);
+                       const std::function<void(const FunctionReplyType& baseReply)>& baseReplyHandler = nullptr);
 
     void startSingleBackgroundRequest(
         const std::function<int64_t()>& requestFunction,
-        const std::function<void(const Core::FunctionReply& baseReply)>& baseReplyHandler = nullptr);
+        const std::function<void(const FunctionReplyType& baseReply)>& baseReplyHandler = nullptr);
 
     void startBackgroundRequests();
 
-    bool requestReply(const Core::FunctionReply& baseReply);
+    bool requestReply(const FunctionReplyType& baseReply);
     bool requestReply(const Core::FunctionReplyObject& replyObject);
 
     bool hasRequests() const
@@ -95,12 +90,12 @@ class LTSUTILSGUIDDS_INTERNAL_EXPORT RequestHelper : public QObject
     void failure();
 
   private:
-    using RequestFunctionContainer = QPair<std::function<int64_t()>, std::function<void(const Core::FunctionReply&)>>;
+    using RequestFunctionContainer = QPair<std::function<int64_t()>, std::function<void(const FunctionReplyType&)>>;
 
     QVector<RequestFunctionContainer> m_requestFunctions;
     bool m_failed;
     int m_repliedId;
-    std::function<void(const Core::FunctionReply&)> m_singleRequestCustomFunctionReply;
+    std::function<void(const FunctionReplyType&)> m_singleRequestCustomFunctionReply;
     bool m_quiet;
     bool m_blockingCall;
     std::function<void(void)> m_successFn;
@@ -109,7 +104,7 @@ class LTSUTILSGUIDDS_INTERNAL_EXPORT RequestHelper : public QObject
     QString m_customWaitMessage;
 
     void done();
-    bool _requestReply(const Core::FunctionReplyObject& fro, const Core::FunctionReply* baseReply);
+    bool _requestReply(const Core::FunctionReplyObject& fro, const FunctionReplyType* baseReply);
 
   signals:
     void signalNextRequest();

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

@@ -2,14 +2,14 @@
 
 #include "client_connection.h"
 
-#include <NGLLogger/NGLLoggerBootstrap.h>
+#include "logger.h"
-#include <QWebSocket>
+#include <QtWebSockets/QWebSocket>
 
 namespace LtsWebSocket
 {
 
 ClientConnection::ClientConnection(QWebSocket* socket, QObject* parent)
-    : QThread(parent), m_logger(NGL::NGLLoggerBootstrap::getLogger()), m_socket(socket ? socket : new QWebSocket)
+    : QThread(parent), m_logger(getLogger("LtsWebSocket.ClientConnection")), m_socket(socket ? socket : new QWebSocket)
 {
 }
 

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

@@ -3,15 +3,15 @@
 #include "connection_handler.h"
 
 #include "client_connection.h"
+#include "logger.h"
 
-#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QtWebSockets/QWebSocket>
 #include <utility>
 
 using namespace LtsWebSocket;
 
 ConnectionHandler::ConnectionHandler(QObject* parent)
-    : QObject(parent), m_server(nullptr), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    : QObject(parent), m_logger(getLogger("LtsWebSocket.ConnectionHandler")), m_server(nullptr)
 {
 }
 

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

@@ -6,7 +6,7 @@
 
 #include <QThread>
 #include <QUrl>
-#include <QWebSocket>
+#include <QtWebSockets/QWebSocket>
 
 namespace LtsWebSocket
 {

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

@@ -11,7 +11,7 @@ namespace LtsWebSocket
 {
 
 LtsWebSocketServer::LtsWebSocketServer(AbstractClientMessageFactory* messageFactory, QObject* parent)
-    : QObject(parent), m_queueTimer(new QTimer(this)), m_messageFactory(messageFactory), m_connectionHandler(nullptr)
+    : QObject(parent), m_logger(getLogger("LtsWebSocket.Server")), m_queueTimer(new QTimer(this)), m_messageFactory(messageFactory), m_connectionHandler(nullptr)
 {
     connect(m_queueTimer, &QTimer::timeout, this, &LtsWebSocketServer::onQueueTimerTimeout);
 

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

@@ -0,0 +1,13 @@
+// Auto-generated export header stub for Qt6 migration
+#ifndef LTSWEBSOCKETCOMMON_EXPORT_H
+#define LTSWEBSOCKETCOMMON_EXPORT_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(LTSWEBSOCKETCOMMON_LIBRARY)
+  #define LTSWEBSOCKETCOMMON_EXPORT Q_DECL_EXPORT
+#else
+  #define LTSWEBSOCKETCOMMON_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // LTSWEBSOCKETCOMMON_EXPORT_H

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

@@ -0,0 +1,12 @@
+#ifndef LTSWEBSOCKETSERVER_EXPORT_H
+#define LTSWEBSOCKETSERVER_EXPORT_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(LTSWEBSOCKETSERVER_LIBRARY)
+#  define LTSWEBSOCKETSERVER_EXPORT Q_DECL_EXPORT
+#else
+#  define LTSWEBSOCKETSERVER_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // LTSWEBSOCKETSERVER_EXPORT_H

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

@@ -154,6 +154,10 @@ MESSAGE(STATUS "DEBUG: After NGL_ADD_BIG_RESOURCES")
 NGL_ADD_BIG_RESOURCES(ltswidgets_SRCS resources/lts_resources.qrc)
 
 MESSAGE(STATUS "DEBUG: BUILD_RTI=${BUILD_RTI}, BUILD_WS=${BUILD_WS}, building LtsWidgets")
+
+# Define MAKE_LTSWIDGETS_LIB for proper symbol export
+ADD_DEFINITIONS(-DMAKE_LTSWIDGETS_LIB)
+
 NGL_ADD_LIBRARY2(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})
 
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets

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

@@ -2,7 +2,7 @@
 #define LTS_ABSTRACT_SEQUENCE_WIDGET_H
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QGroupBox>
 #include <QList>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QDoubleSpinBox>
 #include <QObject>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QDialog>
 #include <QObject>

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

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <LtsUtilsCore/lts_translatable_identifier.h>
 #include <QAbstractItemView>

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

@@ -3,7 +3,7 @@
 #pragma once
 #include "lts_base.h"
 #include "lts_notification_box.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 #include "qevent.h"
 
 #include <QMap>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QMouseEvent>
 #include <QObject>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <LtsUtilsCore/variant_operators.h>
 #include <QDataStream>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QComboBox>
 #include <QObject>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 #include "qcheckbox.h"
 #include "qpushbutton.h"
 

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QWidget>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QDate>
 #include <QObject>

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

@@ -3,7 +3,7 @@
 #pragma once
 #include "lts_base.h"
 #include "lts_dialog_button_box.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 #include "requirement_widget.h"
 
 #include <NGLLogger/NGLLoggerBootstrap.h>

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

@@ -2,7 +2,7 @@
 
 #pragma once
 #include "lts_message_dialog.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QPushButton>

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

@@ -3,7 +3,7 @@
 #pragma once
 #include "lts_base.h"
 #include "lts_drop_handler.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QIcon>
 #include <QObject>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QLabel>
 #include <QObject>

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

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QEvent>
 #include <QObject>

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

@@ -2,7 +2,7 @@
 
 #pragma once
 #include "lts_base.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QDialog>
 #include <QObject>

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

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 

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

@@ -2,7 +2,7 @@
 
 #pragma once
 #include "lts_base.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QGridLayout>
 #include <QObject>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QWidget>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QWidget>

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

@@ -2,7 +2,7 @@
 
 #pragma once
 #include "lts_frameless_dialog.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QWidget>

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

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "lts_frameless_dialog.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QHash>
 #include <QObject>

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

@@ -1,5 +1,5 @@
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QDateTimeEdit>
 #include <QObject>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QRegularExpression>

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

@@ -1,5 +1,5 @@
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QPainterPath>

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

@@ -2,7 +2,7 @@
 
 #pragma once
 #include "lts_frameless_dialog.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QWidget>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QGraphicsView>
 #include <QObject>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QWidget>

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

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QPointer>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QSlider>

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

@@ -2,7 +2,7 @@
 
 #pragma once
 #include "lts_frameless_dialog.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QSpinBox>

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

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QSplashScreen>

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

@@ -2,7 +2,7 @@
 
 #pragma once
 #include "lts_base.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QList>
 #include <QObject>

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

@@ -2,7 +2,7 @@
 
 #pragma once
 #include "lts_base.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QList>
 #include <QObject>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QTabBar>

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

@@ -5,7 +5,7 @@
 
 #pragma once
 #include "lts_abstract_sequence_widget.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 

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

@@ -2,7 +2,7 @@
 
 #pragma once
 #include "lts_base.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QAbstractButton>
 #include <QMap>

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

@@ -1,5 +1,5 @@
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QWidget>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QGridLayout>
 #include <QHBoxLayout>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QToolBar>

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

@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QMap>
 #include <QObject>

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

@@ -2,7 +2,7 @@
 
 #pragma once
 #include "lts_base.h"
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QObject>
 #include <QToolBox>

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

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QString>
 #include <memory>

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

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "ltswidgets_export.h"
+#include "lts_widgets_export.h"
 
 #include <QVector>
 #include <QWidget>

qt6-after/qt6-migrated-legatus/Lts/Common/httq/AbstractServer.cpp

@@ -1,6 +1,6 @@
 #include <QTcpServer>
 #include <QTcpSocket>
-#include <QWebSocketServer>
+#include <QtWebSockets/QWebSocketServer>
 #include <httq/AbstractServer.h>
 #include <httq/HttpRequest.h>
 #include <httq/Logger.h>

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

@@ -28,6 +28,10 @@ NGL_WRAP_UI(aes_base_gui_SRCS
 )
 
 NGL_ADD_LIBRARY2(WS AesBaseGui SHARED ${aes_base_gui_SRCS})
+NGL_TARGET_INCLUDE_DIRECTORIES(AesBaseGui
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../Services/
+)
 NGL_TARGET_LINK_LIBRARIES(AesBaseGui
   PRIVATE
     ExmDataPluginInterface

qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/CMakeLists.txt

@@ -28,6 +28,7 @@ NGL_ADD_LIBRARY2(WS AvmShared SHARED ${SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(AvmShared
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../../Services/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../Common/
 )
 NGL_TARGET_LINK_LIBRARIES(AvmShared
   PUBLIC

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

@@ -4,6 +4,23 @@
 # $Author$
 #
 
+# Add Services directory to include path for all plugins
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Services/)
+# Add AudioVideoManagement stub headers for non-RTI builds
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/AudioVideoManagement/)
+# Add GuezNasat for logger.h
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Proxies/GuezNasat/)
+# Add Viewer/LtsDataView for abstract_display_widget.h
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Viewer/LtsDataView/)
+# Add OperatorManagement stub headers for non-FilterManagement builds
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/OperatorManagement/)
+# Add NGLLogger stub headers
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/NGLLogger/)
+# Add LtsSession stub headers
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/LtsSession/)
+# Add TopicEditorBase stub headers
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/TopicEditorBase/)
+
 ADD_SUBDIRECTORY(AdvancedSymbology)
 ADD_SUBDIRECTORY(AppStarter)
 ADD_SUBDIRECTORY(AreaEffectSimulation)
@@ -40,13 +57,17 @@ ADD_SUBDIRECTORY(OcBaseDownload)
 ADD_SUBDIRECTORY(OcSituationClient)
 ADD_SUBDIRECTORY(OnlineReports)
 ADD_SUBDIRECTORY(OperatorManagement)
-ADD_SUBDIRECTORY(ParticipantManagement) # includes ParticipantOrgChart (conditionally built)
+IF(BUILD_RTI)
+  ADD_SUBDIRECTORY(ParticipantManagement) # includes ParticipantOrgChart (conditionally built)
+ENDIF()
 # PlanEditor requires WebEngine + ArcGIS - skip for Qt6 migration baseline
 IF(BUILD_PLUGINS_PLANEDITOR)
   ADD_SUBDIRECTORY(PlanEditor)
 ENDIF()
 ADD_SUBDIRECTORY(PlanOverlays)
-ADD_SUBDIRECTORY(PresentationManagement)
+IF(BUILD_RTI)
+  ADD_SUBDIRECTORY(PresentationManagement)
+ENDIF()
 ADD_SUBDIRECTORY(ProjectDataManagement)
 ADD_SUBDIRECTORY(ProjectionWorkstation)
 ADD_SUBDIRECTORY(ReportManagement)

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

@@ -16,6 +16,10 @@ SET(gna_common_gui_SRCS
 )
 
 NGL_ADD_LIBRARY2(WS GnaCommon SHARED ${gna_common_gui_SRCS} )
+NGL_TARGET_INCLUDE_DIRECTORIES(GnaCommon
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../Services/
+)
 NGL_TARGET_LINK_LIBRARIES(GnaCommon
   PRIVATE
     LtsSessionData

qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/Common/gna_nasat_aircraft_model.h

@@ -5,7 +5,7 @@
 
 #include "gnacommon_export.h"
 #include <GuezNasat/gna_dtc.h>
-#include <GuezNasat/logger.h>
+#include <LtsGuezNasat/logger.h>
 
 #include <LtsWidgets/lts_abstract_table_model.h>
 

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

@@ -22,6 +22,10 @@ NGL_WRAP_UI(mrk_common_gui_SRCS
 )
 
 NGL_ADD_LIBRARY2(WS MrkCommon SHARED ${mrk_common_gui_SRCS})
+NGL_TARGET_INCLUDE_DIRECTORIES(MrkCommon
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../Viewer/
+)
 NGL_TARGET_LINK_LIBRARIES(MrkCommon
   PRIVATE
     NGLLogger

qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/Common/CustomViews/mrk_marker.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <Viewer/LtsDataView/abstract_display_widget.h>
+#include <LtsDataView/abstract_display_widget.h>
 #include <mrkcommon_export.h>
 
 namespace Ui

qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.cpp

@@ -13,7 +13,7 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QTimer>
-#include <QWebSocket>
+#include <QtWebSockets/QWebSocket>
 
 namespace OcBaseDownload
 {

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_search_modal.cpp

@@ -61,7 +61,7 @@ void ParticipantSearchModal::onOkay()
   close();
 }
 
-void ParticipantSearchModal::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
+void ParticipantSearchModal::onParticipantChanged(const ParticipantManagement::Participant &data, ::DataModification modType)
 {
   const int newEqId = data.equipmentNumber().is_set() ? data.equipmentNumber().get() : 0;
   switch (modType)

qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_search_modal.h

@@ -34,7 +34,7 @@ public:
 
 private slots:
   void onOkay();
-  void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType);
+  void onParticipantChanged(const ParticipantManagement::Participant &data, ::DataModification modType);
 
 signals:
   void participantSelected(int participantId);

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

@@ -26,6 +26,12 @@ NGL_WRAP_UI(pre_common_SRCS
 )
 
 NGL_ADD_LIBRARY2(WS PreGuiCommon SHARED ${pre_common_SRCS})
+NGL_TARGET_INCLUDE_DIRECTORIES(PreGuiCommon
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../include/Services/PresentationManagement
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Common/LtsUtils
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../include
+)
 NGL_TARGET_LINK_LIBRARIES(PreGuiCommon
   Qt6::Core
   Qt6::Widgets

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Common/pre_model.h

@@ -6,7 +6,7 @@
 #include <PresentationManagement/pre_dtc.h>
 #include <Services/PresentationManagement/logger.h>
 #include <preguicommon_export.h>
-#include <Services/OperatorManagement/opm_dtc.h>
+#include <Lts/Services/OperatorManagement/opm_dtc.h>
 
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>

qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Common/pws_rfb_protocol.h

@@ -5,6 +5,8 @@
 #include <QtGlobal>
 #include <QVector>
 #include <QDataStream>
+#include <QVarLengthArray>
+#include <QIODevice>
 
 namespace ProjectionWorkstation
 {

qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.h

@@ -4,7 +4,7 @@
 
 #include "WebSocket/pws_web_socket_client.h"
 
-#include <QWebSocket>
+#include <QtWebSockets/QWebSocket>
 
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsProjectionWorkstation/logger.h>

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp

@@ -5,7 +5,7 @@
 #include "adapter_dds.h"
 #include <utility>
 
-#include <Map/map.h>
+#include <Lts/Viewer/SituationMap/Map/map.h>
 #include <Map/layer_factory.h>
 #include <Map/location_display.h>
 #include <Map/party_id_to_color_functor.h>

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.h

@@ -8,7 +8,7 @@
 #include "plugin_provider.h"
 #include "map_object_type.h"
 #include "resource_manager_mode.h"
-#include <Map/situation_map_types.h>
+#include <Lts/Viewer/SituationMap/Map/situation_map_types.h>
 #include <Common/situation_map_logging.h>
 
 #include <Common/ref_pointer.h>

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.cpp

@@ -3,7 +3,7 @@
 
 #include "booby_traps_to_map.h"
 #include <Map/object_factory.h>
-#include <Map/map.h>
+#include <Lts/Viewer/SituationMap/Map/map.h>
 
 namespace SituationMap
 {

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp

@@ -4,7 +4,7 @@
 
 #include "building_contamination.h"
 #include <utility>
-#include <Map/map.h>
+#include <Lts/Viewer/SituationMap/Map/map.h>
 #include <Map/object_factory.h>
 #include <MapObjects/cube.h>