Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
@@ -47,22 +47,22 @@ bool CustomViewDangerArea::init(const QModelIndex &idx)

 bool CustomViewDangerArea::calculateIcon(const AreaEffectSimulation::DangerArea &area, const QColor &color)
 {
-  if (area.segments().size() == 0)
+  if (area.segments.size() == 0)
    return false;

  QVector<QPointF> segments;
-  segments.reserve(area.segments().size());
+  segments.reserve(area.segments.size());
  int setZone = -1;
-  for (const Core::GeoPosition2D &s : area.segments())
+  for (const Core::GeoPosition2D &s : area.segments)
  {
-    const LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(s.lon(), s.lat(), setZone));
+    const LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(s.lon, s.lat, setZone));
    if (setZone < 0)
      setZone = coord.zone;
    segments.append(QPointF(coord.x, coord.y));
  }

  QPolygonF poly = AreaEffectSimulation::Polygons::dangerArea(segments);
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(area.effectStateId());
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(area.effectStateId);
  const auto pix = Polygons::pixmapFromPolygon(poly, color, ICON_RESOLUTION, bStyle);
  m_ui->lblIcon->setPixmap(pix);

@@ -66,15 +66,15 @@ void DangerAreaEdit::enableUiElements(bool enable)
  m_ui->pbClear->setEnabled(enable);
  m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
  setEffectStartEnabled(m_ui->dteEffectStart, enable);
-  if (m_aesItem.effectStateId() == AesEffectState::EsExpired)
+  if (m_aesItem.effectStateId == AesEffectState::EsExpired)
  {
-    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name()));
+    m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name));
    __unchange__();
  }
-  if (m_aesItem.effectStateId() == AesEffectState::EsActivated)
+  if (m_aesItem.effectStateId == AesEffectState::EsActivated)
  {
    QString name = m_ui->leIdentifier->text();
-    auto baseData = m_dtc->dangerArea(m_aesItem.id());
+    auto baseData = m_dtc->dangerArea(m_aesItem.id);
    setData(baseData, false);
    __unchange__();
    if (name != m_ui->leIdentifier->text())
@@ -112,8 +112,8 @@ bool DangerAreaEdit::init(int aesItemId, bool copy,

  auto cb = [this](const DangerAreaCorrelatedAesItem &item)
  {
-    if (item.dangerAreaId() == m_aesItem.id()) 
-      m_otherAesItemIds << item.aesItemId();
+    if (item.dangerAreaId == m_aesItem.id) 
+      m_otherAesItemIds << item.aesItemId;
  };
  m_dtc->dangerAreaCorrelatedAesItems(cb);
  setPbAesItemsText();
@@ -136,12 +136,12 @@ void DangerAreaEdit::setPbAesItemsText()
  {
    AesItem item;
    m_dtc->aesItemFromId(idx, item);
-    if (item.id() <= 0)
+    if (item.id <= 0)
      continue;
    
-    if (item.effectStateId() != AesEffectState::EsActivated)
+    if (item.effectStateId != AesEffectState::EsActivated)
      continue;
-    sl << QString::fromStdString(item.name().c_str());
+    sl << QString::fromStdString(item.name.c_str());
  }
  m_ui->pbAesItems->setEnabled(sl.size());
  m_ui->pbAesItems->setText(sl.join(QStringLiteral(", ")));
@@ -152,12 +152,12 @@ void DangerAreaEdit::setData(const DangerArea &aesItem, bool copy)
  m_aesItem = aesItem;
  if (copy)
  {
-    m_aesItem.id(0);
-    m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default());
+    m_aesItem.id = 0;
+    m_aesItem.effectStateId = AreaEffectSimulation::AesEffectState::EsUnknown;
  }
-  m_ui->leIdentifier->setText(QString::fromStdString(aesItem.name()));
-  m_ui->dteEffectStart->setMsecsSinceEpoch(aesItem.effectStart().is_set() ? aesItem.effectStart().get() : 0);
-  setCoordinates(aesItem.segments());
+  m_ui->leIdentifier->setText(QString::fromStdString(aesItem.name));
+  m_ui->dteEffectStart->setMsecsSinceEpoch(aesItem.effectStart.has_value() ? aesItem.effectStart.get() : 0);
+  setCoordinates(aesItem.segments);
 }

 void DangerAreaEdit::getPolygon()
@@ -194,11 +194,11 @@ bool DangerAreaEdit::apply()
 {
  std::string name       = m_ui->leIdentifier->text().toStdString();
  qint64 effectStart     = m_ui->dteEffectStart->msecsSinceEpoch();
-  const DangerAreaModifyRequest req(m_aesItem.id(),
+  const DangerAreaModifyRequest req(m_aesItem.id,
                                    name,
                                    0,
                                    311, 
-                                    LtsUtils::toOptional(effectStart),
+                                    LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
                                    getCoordinates(),
                                    dds::core::optional<int32_t>(),
                                    dds::core::optional<int32_t>(),
@@ -213,14 +213,14 @@ bool DangerAreaEdit::apply()

 void DangerAreaEdit::onCorrelatedItemsChanged(const DangerAreaCorrelatedAesItem &data, DataModification modType)
 {
-  if (data.dangerAreaId() != m_aesItem.id())
+  if (data.dangerAreaId != m_aesItem.id)
    return;

  if (modType == DataModification::eAdded)
-    m_otherAesItemIds += data.aesItemId();
+    m_otherAesItemIds += data.aesItemId;

  if (modType == DataModification::eRemoved)
-    m_otherAesItemIds -= data.aesItemId();
+    m_otherAesItemIds -= data.aesItemId;
  

  setPbAesItemsText();
@@ -235,7 +235,7 @@ void DangerAreaEdit::onPbAesItemsClicked()
  if (!m_session->getForeignGuiInterface<ForeignInfoGuiInterface>(infoGuiInterface))
    return;

-  LtsWidgets::LtsDialog *dialog = infoGuiInterface->showDangerAreaAesItemInfo({m_aesItem.id()}, m_otherAesItemIds);
+  LtsWidgets::LtsDialog *dialog = infoGuiInterface->showDangerAreaAesItemInfo({m_aesItem.id}, m_otherAesItemIds);

  addDialog(dialog, m_menuGroup, tr("Danger Areas for BC Contamination %1").arg(m_ui->leIdentifier->text()), LtsWidgets::LayoutArea::eInfoTab);
 }
@@ -3,7 +3,7 @@

 #pragma once

-#include <AreaEffectSimulation/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
 #include <AreaEffectSimulation/aes_ftc.h>

 class QDoubleSpinBox;
@@ -28,7 +28,7 @@ public:

  QString dialogIdentifier() const override
  {
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddDangerArea") : QStringLiteral("EditDangerArea%1").arg(m_aesItem.id());
+    return m_aesItem.id <= 0 ? QStringLiteral("AddDangerArea") : QStringLiteral("EditDangerArea%1").arg(m_aesItem.id);
  }
  bool init(int aesItemId, bool copy, LtsSession::LtsSession *session);

@@ -3,7 +3,7 @@

 #pragma once

-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include "aes_danger_area_gui_plugin_interface.h"

 namespace AreaEffectSimulation
@@ -3,8 +3,8 @@

 #pragma once

-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>

 namespace AreaEffectSimulation
 {
@@ -3,7 +3,7 @@

 #pragma once

-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>

 namespace LtsSession
 {