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
@@ -7,7 +7,14 @@


 ADD_SUBDIRECTORY(Common)
-ADD_SUBDIRECTORY(Gui)
+# The GUI plugins link BuildingViewerCommon, which is skipped when BgViewer is absent
+# (RETURN() in Common/CMakeLists.txt). Skip the Gui subdirectory in that case so the
+# plugins are not built against a non-existent common lib (and its generated export header).
+if(TARGET BuildingViewerCommon)
+  ADD_SUBDIRECTORY(Gui)
+else()
+  MESSAGE(STATUS "BuildingViewer Gui plugins skipped (BuildingViewerCommon not built)")
+endif()

 #
 # Gui Plugin Interface
@@ -6,7 +6,7 @@
 #include "bdv_dds_controller.h"

 #include <Common/bdv_communication_interface_internal.h>
-#include <Common/bdv_plugin_provider.h>
+#include <BuildingViewer/Common/bdv_plugin_provider.h>
 #include <LtsAppManager/lts_app_manager.h>
 #include <LtsPluginManager/lts_plugin_manager.h>
 #include <LtsSession/lts_session.h>
@@ -1,6 +1,7 @@


 #include "bdv_dds_controller.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>

 #include "bdv_communication_interface_internal.h"
 #include "bdv_controller.h"
@@ -13,7 +14,7 @@
 #include <LtsUtils/LtsUtilsCore/outdated_position.h>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <InfrastructureManagement/ism_mounting_point.h>
+#include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <QtCore/QDateTime>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
@@ -551,7 +552,7 @@ void BuildingViewerDdsController::onReplayChanged(const SituationReplay::SitRepl
 {
    Q_UNUSED(modType)

-    switch (srp.state().underlying())
+    switch (srp.state())
    {
        case SituationReplay::SrpState::Stopped:
            m_connection->setSimuationPace(1.0);
@@ -600,7 +601,7 @@ void BuildingViewerDdsController::handleMountingPoint(const InfrastructureManage

    BuildingViewer::AssetTypes assetType;
    QString strAssetType;
-    switch (mp.type().underlying())
+    switch (mp.type())
    {
        case InfrastructureManagement::MountingPointType::AnnouncementUnit:
            assetType = BuildingViewer::AssetTypes::AnnouncementUnit;
@@ -1031,7 +1032,7 @@ void BuildingViewerDdsController::onHitLineInfoChanged(const ParticipantManageme
    int lineType = 2;
    m_pdmDtc->chargeType(hli.chargeTypeId());

-    lineType = m_pdmDtc->getChargeTypeSpecialProperty(hli.chargeTypeId(), 0, 0).underlying();
+    lineType = m_pdmDtc->getChargeTypeSpecialProperty(hli.chargeTypeId(), 0, 0);

    m_connection->playerHit(hli.id(), partSrc.id(), partDst.id(), originatorSrc, injuryDest, buildingIdSrc,
                            roomNumberSrc, buildingIdDst, roomNumberDst, lineType, hli.sampleTime());
@@ -1177,7 +1178,7 @@ void BuildingViewerDdsController::createBoobyTrap(const AreaEffectSimulation::Bo
        return;

    ParticipantManagement::Participant participant;
-    if (trap.partyId().is_set())
+    if (trap.partyId().has_value())
        participant.partyId() = trap.partyId().get();
    participant.designator() = trap.name();
    participant.designator() = trap.name();
@@ -288,7 +288,7 @@ void BuildingEdit::onDestroyElement()
    std::vector<int32_t> structureElementIds;
    getStructureElementIds(m_model->privateData(selIndex), structureElementIds);

-    sendBuildingStateRequest(ProjectDataManagement::VulnerabilityState::CatastrophicKill, structureElementIds);
+    sendBuildingStateRequest(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill, structureElementIds);
 }

 void BuildingEdit::getStructureElementIds(NGLTreeItem* item, std::vector<int32_t>& structureElementIds)
@@ -1,6 +1,7 @@


 #include "bdv_edit_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>

 #include <Common/logger.h>
 #include <QtWidgets/QApplication>
@@ -14,31 +14,31 @@ public:

  
  explicit TreeItem(const InfrastructureManagement::MainStructureElement &mse)
-    : m_displayName(toQString(mse.name()))
-    , m_structureElementId(mse.id())
-    , m_name(toQString(mse.name()) + QStringLiteral(" (ModelId: ") + QString::number(mse.modelId()) + QStringLiteral(")"))
+    : m_displayName(toQString(mse.name))
+    , m_structureElementId(mse.id)
+    , m_name(toQString(mse.name) + QStringLiteral(" (ModelId: ") + QString::number(mse.modelId) + QStringLiteral(")"))
  {}

  
  explicit TreeItem(const InfrastructureManagement::StructureElement &se)
-    : m_displayName(toQString(se.displayName()))
+    : m_displayName(toQString(se.displayName))
    , m_isFloor(true)
-    , m_structureElementId(se.id())
-    , m_mountingPointId(se.mountingPointId())
-    , m_name(toQString(se.name()))
+    , m_structureElementId(se.id)
+    , m_mountingPointId(se.mountingPointId)
+    , m_name(toQString(se.name))
  {}

  
  explicit TreeItem(const InfrastructureManagement::StructureElement &se
                    , double fortifyFactor
                    , qint32 damagePercent)
-    : m_displayName(toQString(se.displayName()))
+    : m_displayName(toQString(se.displayName))
    , m_fortifyFactor(fortifyFactor)
    , m_damagePercent(damagePercent)
    , m_isRoom(true)
-    , m_structureElementId(se.id())
-    , m_mountingPointId(se.mountingPointId())
-    , m_name(toQString(se.name()))
+    , m_structureElementId(se.id)
+    , m_mountingPointId(se.mountingPointId)
+    , m_name(toQString(se.name))
  {}

  int32_t structureElementId() const
@@ -4,7 +4,7 @@
 #include "topic_editor.h"
 #include "ui_topic_editor.h"

-#include <Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_controller.h>
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsAppManager/lts_app_manager.h>
 #include <LtsPluginManager/lts_plugin_manager.h>
@@ -3,7 +3,7 @@

 #pragma once

-#include <BuildingViewer/BuildingViewer/bdv_viewer_data_view.h>
+#include <Plugins/BuildingViewer/Gui/BuildingViewer/bdv_viewer_data_view.h>
 #include <TopicEditorBase/topic_editor_base.h>
 #include <LtsSession/lts_session.h>

@@ -1,6 +1,7 @@


 #include "bdv_replay_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>

 namespace BuildingViewer
 {
@@ -6,7 +6,7 @@
 #include "bdv_thread_video_exporter.h"
 #include "bdv_viewer_gui_plugin.h"

-#include <Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_controller.h>
 #include <LtsSession/lts_session.h>
 #include <QtCore/QDir>
 #include <QtCore/QJsonDocument>
@@ -15,7 +15,7 @@

 #ifdef EXPORT_BDV_TOPIC_AS_JSON
 #include <Common/BgViewer/viewerCtrl/viewwidgetstate.h>
-#include <Common/bdv_helper.h>
+#include <BuildingViewer/Common/bdv_helper.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include <QtCore/QFile>
 #else
@@ -4,7 +4,7 @@
 #pragma once

 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <Common/bdv_helper.h>
+#include <BuildingViewer/Common/bdv_helper.h>

 namespace BuildingViewer
 {
@@ -5,7 +5,7 @@
 #include "ui_bdv_viewer_data_view.h"
 #include "bdv_viewer_data_model.h"

-#include <Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_controller.h>

 #include <QtGui/QKeyEvent>

@@ -25,9 +25,9 @@
 #include "bdv_topic_replay_interface.h"
 #include "bdv_viewer_gui_plugin_provider.h"

-#include <Common/bdv_helper.h>
-#include <Common/bdv_controller.h>
-#include <Common/bdv_plugin_provider.h>
+#include <BuildingViewer/Common/bdv_helper.h>
+#include <BuildingViewer/Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_plugin_provider.h>


 namespace BuildingViewer
@@ -1,6 +1,7 @@


 #include "bdv_viewer_gui_plugin_provider.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>

 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <AreaEffectSimulation/aes_data_plugin_interface.h>
@@ -2,7 +2,7 @@

 #pragma once

-#include <Common/bdv_plugin_provider.h>
+#include <BuildingViewer/Common/bdv_plugin_provider.h>
 #include <Common/logger.h>
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
@@ -3,7 +3,7 @@

 #include "ui_bdv_viewer_settings.h"
 #include "bdv_viewer_settings.h"
-#include <Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_controller.h>

 #include <LtsUtilsSettings/settings.h>

@@ -2,7 +2,7 @@

 #include "ui_bdv_viewer_state.h"
 #include "bdv_viewer_state.h"
-#include <Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_controller.h>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsSession/lts_session_manager.h>
 #include <PluginInterfaces/data_plugin_interface.h>