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
@@ -60,15 +60,15 @@ bool CustomViewNContamination::init(const QModelIndex &idx)
 bool CustomViewNContamination::calculateIcon(const NContamination &nContamination, const QColor &color)
 {
  Database::AesNContamination nContaOut;
-  nContaOut.borderLengthInner = nContamination.borderLengthInner();
-  nContaOut.borderLengthOuter = nContamination.borderLengthOuter();
-  nContaOut.impactPosition = QPointF(nContamination.impactPosition().lon(), nContamination.impactPosition().lat());
-  nContaOut.impactRadius = nContamination.impactRadius();
-  nContaOut.rotationAngle = nContamination.rotationAngle();
-  nContaOut.spanAngle = nContamination.spanAngle();
+  nContaOut.borderLengthInner = nContamination.borderLengthInner;
+  nContaOut.borderLengthOuter = nContamination.borderLengthOuter;
+  nContaOut.impactPosition = QPointF(nContamination.impactPosition.lon, nContamination.impactPosition.lat);
+  nContaOut.impactRadius = nContamination.impactRadius;
+  nContaOut.rotationAngle = nContamination.rotationAngle;
+  nContaOut.spanAngle = nContamination.spanAngle;

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

@@ -63,7 +63,7 @@ NContaminationEdit::NContaminationEdit(const QString &menuGroup, QWidget *parent
  s_stepDurationMinutes     =    10.0;

  m_ui->rotationAngleEdit->initAngleEditWidget(2); 
-  m_ui->cbWeather->setCurrentIndex(AesWeatherSource::AwsNone);
+  m_ui->cbWeather->setCurrentIndex(static_cast<int>(AesWeatherSource::AwsNone));

  m_ui->sbRadiusKm->setMinimum(s_minRadiusKm);
  m_ui->sbRadiusKm->setMaximum(s_maxRadiusKm);
@@ -105,9 +105,9 @@ NContaminationEdit::NContaminationEdit(const QString &menuGroup, QWidget *parent
  connect(m_ui->sbRange2Km, &QDoubleSpinBox::editingFinished, this, &NContaminationEdit::correctSpinBoxValue);
  connect(m_ui->sbYield,    &QDoubleSpinBox::editingFinished, this, &NContaminationEdit::correctSpinBoxValue);

-  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsNone), AesWeatherSource::AwsNone);
-  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsStatic), AesWeatherSource::AwsStatic);
-  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsDynamic), AesWeatherSource::AwsDynamic);
+  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsNone), static_cast<int>(AesWeatherSource::AwsNone));
+  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsStatic), static_cast<int>(AesWeatherSource::AwsStatic));
+  m_ui->cbWeather->addItem(toString(AesWeatherSource::AwsDynamic), static_cast<int>(AesWeatherSource::AwsDynamic));

  m_ui->lblChargeType->hide();
  m_ui->cbChargeType->hide();
@@ -133,13 +133,13 @@ void NContaminationEdit::onPresetChanged(int id)
    return;

  ProjectDataManagement::NuclearPreset ps = m_presets.value(id);
-  if (ps.id() != id)
+  if (ps.id != id)
    return;

-  m_ui->sbYield->setValue(ps.detonationValue());
-  m_ui->sbRadiusKm->setValue(ps.impactRadius() / 1000.0);
-  m_ui->sbRange1Km->setValue(ps.borderLengthInner() / 1000.0);
-  m_ui->sbRange2Km->setValue(ps.borderLengthOuter() / 1000.0);
+  m_ui->sbYield->setValue(ps.detonationValue);
+  m_ui->sbRadiusKm->setValue(ps.impactRadius / 1000.0);
+  m_ui->sbRange1Km->setValue(ps.borderLengthInner / 1000.0);
+  m_ui->sbRange2Km->setValue(ps.borderLengthOuter / 1000.0);
 }

 void NContaminationEdit::showPreviewObject()
@@ -202,7 +202,7 @@ double NContaminationEdit::spanAngle() const
  double radial2 = m_ui->rotationAngleEdit->getAngleConverted(m_ui->rotationAngleEdit->getAngle(1), LtsAngleEditBase::AngleUnitType::Deg,
                                                              m_ui->rotationAngleEdit->getAngleCurrentUnit()); 

-  if (m_ui->cbWeather->currentData().toInt() != AreaEffectSimulation::AesWeatherSource::AwsNone)
+  if (m_ui->cbWeather->currentData().toInt() != static_cast<int>(AreaEffectSimulation::AesWeatherSource::AwsNone))
    return radial1;

  double spanAngle = radial2 - radial1;
@@ -213,7 +213,7 @@ double NContaminationEdit::spanAngle() const

 double NContaminationEdit::rotatianAngle() const
 {
-  if (m_ui->cbWeather->currentData().toInt() != AreaEffectSimulation::AesWeatherSource::AwsNone)
+  if (m_ui->cbWeather->currentData().toInt() != static_cast<int>(AreaEffectSimulation::AesWeatherSource::AwsNone))
    return 0.0;

  double radial1 = m_ui->rotationAngleEdit->getAngleConverted(m_ui->rotationAngleEdit->getAngle(0), LtsAngleEditBase::AngleUnitType::Deg,
@@ -244,15 +244,15 @@ void NContaminationEdit::enableUiElements(bool enable)
  m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable());
  m_ui->cbWeather->setEnabled(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->nContamination(m_aesItem.id());
+    auto baseData = m_dtc->nContamination(m_aesItem.id);
    setData(baseData, false);
    __unchange__();
    if (name != m_ui->leIdentifier->text())
@@ -283,7 +283,7 @@ bool NContaminationEdit::init(int aesItemId, bool copy,
  {
    m_presets = pdmDtc->nuclearPresets();
    for (const ProjectDataManagement::NuclearPreset &preset : std::as_const(m_presets))
-      m_ui->cbStandardValues->addItem(pdmDtc->trNuclearPresetName(preset.id()), preset.id());
+      m_ui->cbStandardValues->addItem(pdmDtc->trNuclearPresetName(preset.id), preset.id);
    connect(m_ui->cbStandardValues, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &NContaminationEdit::onPresetChanged);
  }
  else
@@ -321,24 +321,24 @@ void NContaminationEdit::setData(const NContamination &contamination, bool copy)

  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(contamination.name()));
-  m_ui->dteEffectStart->setMsecsSinceEpoch(contamination.effectStart().is_set() ? contamination.effectStart().get() : 0);
-  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(contamination.chargeStruct().chargeTypeId()));
-  m_ui->cbWeather->setCurrentIndex(m_ui->cbWeather->findData(contamination.weatherSource().underlying()));
+  m_ui->leIdentifier->setText(QString::fromStdString(contamination.name));
+  m_ui->dteEffectStart->setMsecsSinceEpoch(contamination.effectStart.has_value() ? contamination.effectStart.get() : 0);
+  m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(contamination.chargeStruct.chargeTypeId));
+  m_ui->cbWeather->setCurrentIndex(m_ui->cbWeather->findData(static_cast<int>(contamination.weatherSource)));

-  const QPointF pos(contamination.impactPosition().lon(), contamination.impactPosition().lat());
+  const QPointF pos(contamination.impactPosition.lon, contamination.impactPosition.lat);
  if (!pos.isNull())
    m_ui->positionEdit->setCoordinate(pos);

-  m_ui->sbYield->setValue(contamination.detonationValue());
-  m_ui->sbRange1Km->setValue(contamination.borderLengthInner() / 1000.0);
-  m_ui->sbRange2Km->setValue(contamination.borderLengthOuter() / 1000.0);
-  m_ui->sbRadiusKm->setValue(contamination.impactRadius() / 1000.0);
-  setRadials(contamination.rotationAngle(), contamination.spanAngle());
+  m_ui->sbYield->setValue(contamination.detonationValue);
+  m_ui->sbRange1Km->setValue(contamination.borderLengthInner / 1000.0);
+  m_ui->sbRange2Km->setValue(contamination.borderLengthOuter / 1000.0);
+  m_ui->sbRadiusKm->setValue(contamination.impactRadius / 1000.0);
+  setRadials(contamination.rotationAngle, contamination.spanAngle);
 }

 void NContaminationEdit::getPosition()
@@ -388,9 +388,9 @@ bool NContaminationEdit::apply()
  AesWeatherSource weatherSourceId = static_cast<AesWeatherSource>(m_ui->cbWeather->currentData().toInt());
  const QPointF p(m_ui->positionEdit->coordinate());
  const Core::GeoPosition2D pos(p.x(), p.y());
-  const NContaminationModifyRequest req(m_aesItem.id(),
+  const NContaminationModifyRequest req(m_aesItem.id,
                                        name,
-                                        LtsUtils::toOptional(effectStart),
+                                        LtsUtils::toOptional(static_cast<int64_t>(effectStart)),
                                        duration,
                                        chargeType,
                                        pos,
@@ -403,7 +403,7 @@ bool NContaminationEdit::apply()
                                        weatherSourceId,
                                        LtsUtils::toOptional(partyId),
                                        LtsUtils::toOptional(playerId),
-                                        dds::core::optional<rti::core::int64>());
+                                        dds::core::optional<int64_t>());

  return m_requestHelper->startSingleRequest([this, req]()
  {
@@ -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>
 #include <LtsWidgets/lts_angle_edit.h>
 #include <ProjectDataManagement/pdm.hpp>
@@ -32,7 +32,7 @@ public:

  QString dialogIdentifier() const override
  {
-    return m_aesItem.id() <= 0 ? QStringLiteral("AddNContamination") : QStringLiteral("EditContamination%1").arg(m_aesItem.id());
+    return m_aesItem.id <= 0 ? QStringLiteral("AddNContamination") : QStringLiteral("EditContamination%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_ncontamination_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
 {