Qt6 Migration: BUILD_RTI guards und CMake fixes

- BUILD_RTI conditional compilation für RTI Connext DDS dependencies
- Namespace fixes in core_dtc.h (Core:: → DDS::Core::)
- CMakeLists.txt: BUILD_RTI option und conditional dependencies
- Handler minelayer: namespace closing mit BUILD_RTI guard
- Build erfolgreich mit BUILD_RTI=OFF validiert

Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>

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

@@ -8,14 +8,14 @@
 namespace LtsTimelineClassic
 {
 
-AbstractTimelineModel::AbstractTimelineModel(QObject *parent) : QAbstractItemModel(parent)
-  .getNGLLogger("Timeline.AbstractTimelineModel"))
-  , m_highestPositionedItem(0)
-  , m_lowestPositionedItem(0)
-  , m_getEventListsRecursive(true) 
-  , m_rootItem(new Item(QLatin1String("#mwille/r00t/")))
-  , m_markersItem(new Item(tr("Markers"), QStringLiteral("Markers"))),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger())
+AbstractTimelineModel::AbstractTimelineModel(QObject *parent)
+    : QAbstractItemModel(parent)
+    , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+    , m_highestPositionedItem(0)
+    , m_lowestPositionedItem(0)
+    , m_getEventListsRecursive(true)
+    , m_rootItem(new Item(QLatin1String("#mwille/r00t/")))
+    , m_markersItem(new Item(tr("Markers"), QStringLiteral("Markers")))
 {
 
     m_rootItem->addItem(m_markersItem);

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

@@ -45,12 +45,24 @@ SET(timeline_UICS
 
 NGL_WRAP_UI(timeline_SRCS ${timeline_UICS})
 
-IF(BUILD_RTI)
 NGL_ADD_LIBRARY2(WS LtsTimelineClassic SHARED ${timeline_SRCS} ${timeline_UICS})
 
+# Qt6 AutoUic configuration for UI files in Ui/ subdirectory
+set_target_properties(LtsTimelineClassic PROPERTIES
+  AUTOUIC ON
+  AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/Ui"
+)
+
+# Generate export header for shared library
+include(GenerateExportHeader)
+generate_export_header(LtsTimelineClassic
+  EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/ltstimelineclassic_export.h"
+)
+
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsTimelineClassic
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 NGL_TARGET_LINK_LIBRARIES(LtsTimelineClassic
@@ -64,21 +76,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsTimelineClassic
 )
 
 
-IF(NEVER)
-  NGL_ADD_EXECUTABLE(WS LtsTimelineClassicTest main.cpp)
-  NGL_TARGET_LINK_LIBRARIES(LtsTimelineClassicTest
-    nglapplication
-    NGLLogger
-    Qt6::Core
-    Qt6::Gui
-    Qt6::Widgets
-    LtsTimelineClassic
-    svcEemCommon
-    svcEemClient
-    PdmDataPluginInterface
-  )
-ENDIF()
-
-NGL_INSTALL_TARGET(LtsTimelineClassic)
-ENDIF(BUILD_RTI)
 

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

@@ -14,10 +14,10 @@ Event::Event(int uniqueId, int typeId, qint64 startTime, qint64 endTime, int pla
              const QStringList& path, const EventPaintFunc& paintFunc, const QColor& paintColor,
              const QJsonObject& detailData, int subEventId, const LtsUtils::QPoint3D& pos,
              LtsSession::LtsSession* session)
-    : m_path(path), m_detailData(detailData), m_position(pos), m_paintFunc(paintFunc), m_session(session),
-      m_eventColor(paintColor), m_startTime(startTime), m_endTime(endTime), m_uniqueId(uniqueId), m_typeId(typeId),
-      m_subEventId(subEventId), m_playerId(playerId), m_partyId(partyId), m_equipmentId(equipmentId), m_deleted(false),
-      m_visible(true), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()), m_path(path), m_detailData(detailData), m_position(pos),
+      m_paintFunc(paintFunc), m_session(session), m_eventColor(paintColor), m_startTime(startTime), m_endTime(endTime),
+      m_uniqueId(uniqueId), m_typeId(typeId), m_subEventId(subEventId), m_playerId(playerId), m_partyId(partyId),
+      m_equipmentId(equipmentId), m_deleted(false), m_visible(true)
 {
     checkDuration();
 }

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

@@ -5,6 +5,8 @@
 #include "ltstimelineclassic_export.h"
 
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
+#include <NGLLogger/INGLLogger.h>
+#include <NGLLoggerBootstrap.h>
 #include <QColor>
 #include <QJsonObject>
 #include <QStringList>
@@ -36,12 +38,14 @@ class LTSTIMELINECLASSIC_EXPORT Event
     static void drawCustomEventGraphicRoundedRect(QPainter* painter, const QRect& rect);
     static void drawMultipleEventGraphic(QPainter* painter, const QRect& rect);
 
-    Event() = default;
     Event(int uniqueId, int typeId, qint64 startTime, qint64 endTime, int playerId, int partyId, int equipmentId,
           const QStringList& path, const EventPaintFunc& paintFunc, const QColor& paintColor,
           const QJsonObject& detailData, int subEventId = -1, const LtsUtils::QPoint3D& pos = LtsUtils::QPoint3D(),
           LtsSession::LtsSession* session = nullptr);
 
+    // Default constructor deleted due to reference member m_logger
+    Event() = delete;
+
     QStringList getActuator() const
     {
         return m_path;

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TestTimelineModel.h

@@ -8,14 +8,25 @@
 namespace LtsTimelineClassic
 {
 
+class TestTimelineModelTest;
+
 class LTSTIMELINECLASSIC_EXPORT TestTimelineModel : public AbstractTimelineModel
 {
     Q_OBJECT
 
+    friend class TestTimelineModelTest;
+
   public:
     TestTimelineModel();
     void addTestEvent(Event* event);
 
+    // Public wrappers for testing (protected in base class)
+    using AbstractTimelineModel::rowCount;
+    using AbstractTimelineModel::columnCount;
+
+    // Implement pure virtual from AbstractTimelineModel
+    qint64 currentTime() const override { return 0; }
+
   private slots:
     void slotEventAction(EventGraphic*, int);
 };

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

@@ -34,17 +34,17 @@
 namespace LtsTimelineClassic
 {
 
-TimelineIndicator::TimelineIndicator(QWidget *parent) : QWidget(parent)
-  , m_zoomFactorPoints(0)
-  , m_pbZoom(new QPushButton(this))
-  , m_pbUnzoom(new QPushButton(this))
-  , m_cbZoomLevel(new QComboBox(this))
-  , m_currentTextHeight(0) 
-  , m_currentTextWidth(0)
-  , m_sectionPos(0)
-  , m_sectionSize(0)
-  .getNGLLogger("Timeline.Indicator")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger())
+TimelineIndicator::TimelineIndicator(QWidget *parent)
+    : QWidget(parent)
+    , m_zoomFactorPoints(0)
+    , m_pbZoom(new QPushButton(this))
+    , m_pbUnzoom(new QPushButton(this))
+    , m_cbZoomLevel(new QComboBox(this))
+    , m_currentTextHeight(0)
+    , m_currentTextWidth(0)
+    , m_sectionPos(0)
+    , m_sectionSize(0)
+    , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_timeArray.reserve(11 + 11 + 7 + 10);
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineIndicator.h

@@ -4,6 +4,7 @@
 #include "EventTools.h"
 #include "LineMap.h"
 
+#include <QComboBox>
 #include <QObject>
 #include <QPair>
 #include <QPoint>
@@ -16,15 +17,18 @@ class INGLLogger;
 }
 class QPushButton;
 class QLabel;
-class QComboBox;
 
 namespace LtsTimelineClassic
 {
 
+class TimelineIndicatorTest;
+
 class TimelineIndicator : public QWidget
 {
     Q_OBJECT
 
+    friend class TimelineIndicatorTest;
+
     static const int s_TimeTextDistanceTolerancePixels = 10;
     static const int s_pbSize = 18;
 
@@ -55,6 +59,10 @@ class TimelineIndicator : public QWidget
     NGL::INGLLogger& m_logger;
     void paintEvent(QPaintEvent*);
 
+  public:
+    // Public getter for testing
+    QComboBox* zoomLevelComboBox() const { return m_cbZoomLevel; }
+
   signals:
 
     void signalSetTimelineRange(qint64 min, qint64 max);

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

@@ -149,7 +149,7 @@ void TimelineView::wheelEvent(QWheelEvent* event)
     if (QGuiApplication::queryKeyboardModifiers() != Qt::ControlModifier)
         return;
 
-    int scrolls = event->delta() / 120;
+    int scrolls = event->angleDelta().y() / 120;
 
     if (scrolls > 0)
     {
@@ -168,7 +168,7 @@ void TimelineView::mouseReleaseEvent(QMouseEvent* event)
 {
     QTreeView::mouseReleaseEvent(event);
 
-    QPoint position = event->globalPos();
+    QPoint position = event->globalPosition().toPoint();
     EventGraphic* eg = getEventOnPosition(position);
 
     if (!eg)

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

@@ -17,16 +17,16 @@
 namespace LtsTimelineClassic
 {
 
-TimelineWidget::TimelineWidget(QWidget *parent) : QWidget(parent)
-  .getNGLLogger("Timeline.Widget"))
-  , m_timelineUi(new Ui::Timeline)
-  , m_min(0)
-  , m_max(1)
-  , m_sbPos(0)
-  , m_zoomFactor(1) 
-  , m_headerView(new TimelineHeaderView)
-  , m_model(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger())
+TimelineWidget::TimelineWidget(QWidget *parent)
+    : QWidget(parent)
+    , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+    , m_timelineUi(new Ui::Timeline)
+    , m_min(0)
+    , m_max(1)
+    , m_sbPos(0)
+    , m_zoomFactor(1)
+    , m_headerView(new TimelineHeaderView)
+    , m_model(nullptr)
 {
     m_timelineUi->setupUi(this);
     m_timelineUi->view->setHeader(m_headerView);