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
This commit is contained in:
1718 files changed
+126739
-18495
No files matched your search
+6
-5
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user