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:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
@@ -89,18 +89,18 @@ void ConfigCnr::buildConfigCnrData()
|
||||
|
||||
AudioVideoManagement::FrequencySetDataWithId &fsd = fsdMap[rcVhf->freqSetDataId];
|
||||
subCircuit.agc = false;
|
||||
subCircuit.akw = fsd.akwBundle.is_set() ? fsd.akwBundle.get() : 0;
|
||||
subCircuit.akw = fsd.akwBundle.has_value() ? fsd.akwBundle.get() : 0;
|
||||
subCircuit.channelSpacing = 0;
|
||||
subCircuit.clipper = false;
|
||||
subCircuit.comsec = fsd.comsec.is_set() ? fsd.comsec.get() : 0;
|
||||
subCircuit.comsec = fsd.comsec.has_value() ? fsd.comsec.get() : 0;
|
||||
subCircuit.crossbeam = 0;
|
||||
subCircuit.frequency = fsd.frequency * 1000;
|
||||
subCircuit.frequencyBand = static_cast<int>(fsd.frequencyBand);
|
||||
subCircuit.fsb = fsd.fsbBundle.is_set() ? fsd.fsbBundle.get() : 0;
|
||||
subCircuit.fsb = fsd.fsbBundle.has_value() ? fsd.fsbBundle.get() : 0;
|
||||
subCircuit.modulationType = 0;
|
||||
subCircuit.orientation = 0;
|
||||
subCircuit.ptSig = rcVhf->pilotTone;
|
||||
subCircuit.rcAkw = fsd.akwRadioCircuit.is_set() ? fsd.akwRadioCircuit.get() : 0;
|
||||
subCircuit.rcAkw = fsd.akwRadioCircuit.has_value() ? fsd.akwRadioCircuit.get() : 0;
|
||||
subCircuit.rcMode = static_cast<int>(rcVhf->operatingMode);
|
||||
subCircuit.rcSubId = toRcIdString(cnrChannel);
|
||||
subCircuit.rcSubName = rcVhf->name;
|
||||
@@ -216,7 +216,7 @@ void ConfigCnr::onFrequencyPlanningChanged(const AudioVideoManagement::Frequency
|
||||
if (!plan)
|
||||
return;
|
||||
|
||||
if (data.id == plan->id || !data.exerciseId.is_set())
|
||||
if (data.id == plan->id || !data.exerciseId.has_value())
|
||||
m_timer.start();
|
||||
}
|
||||
|
||||
@@ -226,7 +226,7 @@ void ConfigCnr::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &data,
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": " << data;
|
||||
|
||||
Q_UNUSED(modType);
|
||||
bool isGlobal = !data.exerciseId.is_set();
|
||||
bool isGlobal = !data.exerciseId.has_value();
|
||||
if ((isGlobal || data.exerciseId.get() == m_exerciseId) && modType != DataModification::eAdded && isInActiveFrequencyPlanning(data))
|
||||
m_timer.start();
|
||||
}
|
||||
@@ -235,7 +235,7 @@ void ConfigCnr::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &data,
|
||||
bool ConfigCnr::isInActiveFrequencyPlanning(const AudioVideoManagement::CnrConfig &data)
|
||||
{
|
||||
|
||||
if(!data.exerciseId.is_set())
|
||||
if(!data.exerciseId.has_value())
|
||||
return true;
|
||||
|
||||
const auto activePlans = m_avmDtc->activeFrequencyPlannings();
|
||||
|
||||
@@ -75,14 +75,14 @@ WebSocketInterface::Messages::PositionsCnrMessage::PositionsCnrMessageData Posit
|
||||
|
||||
QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> PositionsCnr::positionsForGlobal(const AudioVideoManagement::CnrConfig &config) const
|
||||
{
|
||||
bool isGlobal = !config.exerciseId.is_set();
|
||||
bool isGlobal = !config.exerciseId.has_value();
|
||||
Q_ASSERT(isGlobal);
|
||||
return positionsForLocal(config);
|
||||
}
|
||||
|
||||
QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> PositionsCnr::positionsFor(const AudioVideoManagement::CnrConfig &config) const
|
||||
{
|
||||
bool isLocal = config.exerciseId.is_set();
|
||||
bool isLocal = config.exerciseId.has_value();
|
||||
if (isLocal)
|
||||
return positionsForLocal(config);
|
||||
else
|
||||
@@ -96,11 +96,11 @@ QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> PositionsCnr::p
|
||||
auto allParticipants = m_ppmDtc->participants();
|
||||
|
||||
QSet<int> participantIdsInUnit;
|
||||
if (config.unitId.is_set())
|
||||
if (config.unitId.has_value())
|
||||
m_ppmDtc->participantIdsByUnit(config.unitId.get(), allParticipants, participantIdsInUnit);
|
||||
else
|
||||
{
|
||||
bool isGlobal = !config.exerciseId.is_set();
|
||||
bool isGlobal = !config.exerciseId.has_value();
|
||||
participantIdsInUnit = participantIdsFromParty(allParticipants, config.partyId, isGlobal);
|
||||
}
|
||||
|
||||
@@ -110,7 +110,7 @@ QVector<WebSocketInterface::Messages::ReplyMessage::LonLatPoint> PositionsCnr::p
|
||||
for (int participantId : std::as_const(participantIdsInUnit))
|
||||
{
|
||||
const ParticipantManagement::Participant &participant = allParticipants.value(participantId);
|
||||
if (!participant.equipmentNumber.is_set())
|
||||
if (!participant.equipmentNumber.has_value())
|
||||
continue;
|
||||
|
||||
const ParticipantManagement::Type &type = m_ppmDtc->type(participant.typeId);
|
||||
|
||||
Reference in new issue
Block a user