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
@@ -61,17 +61,17 @@ bool CustomViewAirSupportImpact::init(const QModelIndex &idx)
 bool CustomViewAirSupportImpact::calculateIcon(const AirSupportImpact &asi, const QColor &color)
 {
  Database::AesAirSupportImpact dbAsi;
-  dbAsi.impactPosition = QPointF(asi.impactPosition().lon(), asi.impactPosition().lat());
+  dbAsi.impactPosition = QPointF(asi.impactPosition.lon, asi.impactPosition.lat);

  std::shared_ptr<ProjectDataManagement::Interface::Dtc> pdmDtc;
  if (!m_session->getDtc<ProjectDataManagement::DataInterface>(pdmDtc))
    return false;

-  double radius = pdmDtc->impactRadius(asi.chargeStruct().chargeTypeId(),
-                                       asi.chargeStruct().igniterTypeId(),
-                                       asi.chargeStruct().igniterFunctionId());
+  double radius = pdmDtc->impactRadius(asi.chargeStruct.chargeTypeId,
+                                       asi.chargeStruct.igniterTypeId,
+                                       asi.chargeStruct.igniterFunctionId);
  QPolygonF poly = AreaEffectSimulation::Polygons::airSupportImpact(dbAsi, radius);
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(asi.effectStateId());
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(asi.effectStateId);
  const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
  m_ui->lblIcon->setPixmap(pix);

@@ -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>
 #include "aes_air_support_9liner_model.h"

 namespace Ui
@@ -48,36 +48,36 @@ QVariant AirSupport9LinerModel::data(const QModelIndex &index, int role) const
  switch (index.column())
  {
  case ParticipantId:
-    return item.participantId();
+    return item.participantId;
  case Participant:
  {
    if (!m_ppmDtc)
      return QString();
-    return m_ppmDtc->hierarchyFromParticipant(item.participantId());
+    return m_ppmDtc->hierarchyFromParticipant(item.participantId);
  }
  case Timestamp:
-    return QDateTime::fromMSecsSinceEpoch(item.sampleTime());
+    return QDateTime::fromMSecsSinceEpoch(item.sampleTime);
  case AttackHeading:
  {
-    if (item.finalAttackHeading() < 0)
+    if (item.finalAttackHeading < 0)
      return QVariant();
-    if (item.finalAttackHeadingHigh() < 0)
+    if (item.finalAttackHeadingHigh < 0)
      return tr("%1 degree")
-          .arg(item.finalAttackHeading());
+          .arg(item.finalAttackHeading);
    return tr("%1 degree (low: %2 degree, high: %3 degreee)", "degree as symbol!")
-        .arg(item.finalAttackHeading())
-        .arg(item.finalAttackHeadingLow())
-        .arg(item.finalAttackHeadingHigh());
+        .arg(item.finalAttackHeading)
+        .arg(item.finalAttackHeadingLow)
+        .arg(item.finalAttackHeadingHigh);
  }
  case TargetPosition:
  {
-    if (std::isnan(item.targetPosition().lat()))
+    if (std::isnan(item.targetPosition.lat))
      return tr("---");
-    LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(item.targetPosition().lon(),
-                                                                                    item.targetPosition().lat()));
+    LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(item.targetPosition.lon,
+                                                                                    item.targetPosition.lat));
    QString ret = coord.mgrs();
-    if (item.targetPosition().z() > 0)
-      ret += QLatin1Char(' ') + QString::number(qRound(item.targetPosition().z()));
+    if (item.targetPosition.z > 0)
+      ret += QLatin1Char(' ') + QString::number(qRound(item.targetPosition.z));
    return ret;
  }
  }
@@ -131,7 +131,7 @@ bool AirSupport9LinerProxyModel::filterAcceptsRow(int source_row, const QModelIn
    return true;

  const qint64 m_offset = 5 * 60 * 1000; 
-  if ((data.sampleTime() + m_offset) > m_session->partitionTime())
+  if ((data.sampleTime + m_offset) > m_session->partitionTime())
    return true;
  return false;
 }
@@ -150,27 +150,27 @@ bool AirSupport9LinerProxyModel::lessThan(const QModelIndex &source_left, const
  switch (source_left.column())
  {
  case AirSupport9LinerModel::ParticipantId:
-    if (left.participantId() != right.participantId())
-      return left.participantId() < right.participantId();
-    return left.sampleTime() < right.sampleTime();
+    if (left.participantId != right.participantId)
+      return left.participantId < right.participantId;
+    return left.sampleTime < right.sampleTime;
  case AirSupport9LinerModel::Participant:
  {
    const auto l = source_left.data();
    const auto r = source_right.data();
    if (l != r)
      return LtsUtils::lessThan(l, r);
-    return left.sampleTime() < right.sampleTime();
+    return left.sampleTime < right.sampleTime;
  }
  case AirSupport9LinerModel::Timestamp:
-    return left.sampleTime() < right.sampleTime();
+    return left.sampleTime < right.sampleTime;
  case AirSupport9LinerModel::AttackHeading:
-    if (left.finalAttackHeading() != right.finalAttackHeading())
-      return left.finalAttackHeading() < right.finalAttackHeading();
-    if (left.finalAttackHeadingLow() != right.finalAttackHeadingLow())
-      return left.finalAttackHeadingLow() < right.finalAttackHeadingLow();
-    if (left.finalAttackHeadingHigh() != right.finalAttackHeadingHigh())
-      return left.finalAttackHeadingHigh() < right.finalAttackHeadingHigh();
-    return left.sampleTime() < right.sampleTime();
+    if (left.finalAttackHeading != right.finalAttackHeading)
+      return left.finalAttackHeading < right.finalAttackHeading;
+    if (left.finalAttackHeadingLow != right.finalAttackHeadingLow)
+      return left.finalAttackHeadingLow < right.finalAttackHeadingLow;
+    if (left.finalAttackHeadingHigh != right.finalAttackHeadingHigh)
+      return left.finalAttackHeadingHigh < right.finalAttackHeadingHigh;
+    return left.sampleTime < right.sampleTime;
  }
  return LtsWidgets::LtsColumnFilterProxyModel::lessThan(source_left, source_right);
 }
@@ -7,6 +7,7 @@
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 #include <GuezNasat/gna_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <LtsSession/lts_session.h>
 #include <QtCore/QSortFilterProxyModel>

@@ -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 <GuezNasat/gna_data_plugin_interface.h>
 #include "aes_air_support_gui_plugin_interface.h"

@@ -107,7 +107,7 @@ void AirSupportExplosionClusterImpactList::createModel()
 {
  m_model = new AesItemSortFilterProxyModelTmpl<EffectCluster>(m_session, this);

-  m_effectClusterModel = new EffectClusterModel({ProjectDataManagement::GearClass::AirSupport}, this);
+  m_effectClusterModel = new EffectClusterModel({ProjectDataManagement::GearClass::GearClass_AirSupport}, this);
  m_effectClusterModel->initModel(m_session);
  m_model->setSourceModel(m_effectClusterModel);
 }
@@ -3,9 +3,9 @@

 #pragma once

-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
-#include <AreaEffectSimulation/Explosion/aes_effect_cluster_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.h>
 #include "aes_air_support_impact_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 AreaEffectSimulation
 {