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
+14
-14
@@ -51,7 +51,7 @@ void RtProfileObserver::onCnrConfigChanged(const CnrConfig &cnrConfig, DataModif
|
||||
return;
|
||||
if (!isInProfile(cnrConfig))
|
||||
return;
|
||||
m_avaControl->changeRtProfileCircuitName(m_rtState, {RadioSystem::Cnr, cnrConfig.id(), cnrConfig.radioCircuit()});
|
||||
m_avaControl->changeRtProfileCircuitName(m_rtState, {RadioSystem::Cnr, cnrConfig.id, cnrConfig.radioCircuit});
|
||||
}
|
||||
|
||||
void RtProfileObserver::onTvcConfigChanged(const TvcConfig &tvcConfig, DataModification modType)
|
||||
@@ -60,14 +60,14 @@ void RtProfileObserver::onTvcConfigChanged(const TvcConfig &tvcConfig, DataModif
|
||||
return;
|
||||
if (!isInProfile(tvcConfig))
|
||||
return;
|
||||
m_avaControl->changeRtProfileCircuitName(m_rtState, {RadioSystem::Tvc, tvcConfig.id(), tvcConfig.radioCircuit()});
|
||||
m_avaControl->changeRtProfileCircuitName(m_rtState, {RadioSystem::Tvc, tvcConfig.id, tvcConfig.radioCircuit});
|
||||
}
|
||||
|
||||
void RtProfileObserver::onCnrTvcProfileChanged(const CnrTvcProfile &profile, DataModification modType)
|
||||
{
|
||||
Q_UNUSED(modType);
|
||||
|
||||
if (profile.exerciseId() != m_exerciseId || profile.operatorId() != m_operatorId)
|
||||
if (profile.exerciseId != m_exerciseId || profile.operatorId != m_operatorId)
|
||||
return;
|
||||
|
||||
switch (modType)
|
||||
@@ -95,16 +95,16 @@ QVector<RtState::RadioCircuit> RtProfileObserver::defaultRtChannels() const
|
||||
const QMap<int, TvcConfig> tvccs = m_dtc->tvcConfigs();
|
||||
|
||||
QVector<RtState::RadioCircuit> rtChannels;
|
||||
rtChannels.reserve(m_profile->data().size());
|
||||
for (const auto &cnrTvcProfileData : m_profile->data())
|
||||
rtChannels.reserve(m_profile->data.size());
|
||||
for (const auto &cnrTvcProfileData : m_profile->data)
|
||||
{
|
||||
std::string circuitName;
|
||||
if (cnrTvcProfileData.radioSystemId() == RadioSystem::Cnr)
|
||||
circuitName = cnrcs.value(cnrTvcProfileData.radioCircuitId()).radioCircuit();
|
||||
if (cnrTvcProfileData.radioSystemId == RadioSystem::Cnr)
|
||||
circuitName = cnrcs.value(cnrTvcProfileData.radioCircuitId).radioCircuit;
|
||||
else
|
||||
circuitName = tvccs.value(cnrTvcProfileData.radioCircuitId()).radioCircuit();
|
||||
circuitName = tvccs.value(cnrTvcProfileData.radioCircuitId).radioCircuit;
|
||||
|
||||
rtChannels.push_back({cnrTvcProfileData.radioSystemId(), cnrTvcProfileData.radioCircuitId(), circuitName});
|
||||
rtChannels.push_back({cnrTvcProfileData.radioSystemId, cnrTvcProfileData.radioCircuitId, circuitName});
|
||||
}
|
||||
|
||||
return rtChannels;
|
||||
@@ -115,7 +115,7 @@ boost::optional<CnrTvcProfile> RtProfileObserver::getProfile() const
|
||||
boost::optional<CnrTvcProfile> foundProfile;
|
||||
std::function<bool(const CnrTvcProfile &profile)> forUserInExercise = [this, &foundProfile] (const CnrTvcProfile &profile)
|
||||
{
|
||||
if (profile.exerciseId() != m_exerciseId || profile.operatorId() != m_operatorId)
|
||||
if (profile.exerciseId != m_exerciseId || profile.operatorId != m_operatorId)
|
||||
return false;
|
||||
foundProfile = profile;
|
||||
return true;
|
||||
@@ -127,12 +127,12 @@ boost::optional<CnrTvcProfile> RtProfileObserver::getProfile() const
|
||||
|
||||
bool RtProfileObserver::isInProfile(const CnrConfig &cnrConfig) const
|
||||
{
|
||||
return isInProfile(RadioSystem::Cnr, cnrConfig.id());
|
||||
return isInProfile(RadioSystem::Cnr, cnrConfig.id);
|
||||
}
|
||||
|
||||
bool RtProfileObserver::isInProfile(const TvcConfig &tvcConfig) const
|
||||
{
|
||||
return isInProfile(RadioSystem::Tvc, tvcConfig.id());
|
||||
return isInProfile(RadioSystem::Tvc, tvcConfig.id);
|
||||
}
|
||||
|
||||
bool RtProfileObserver::isInProfile(RadioSystem radioSystem, int32_t id) const
|
||||
@@ -140,8 +140,8 @@ bool RtProfileObserver::isInProfile(RadioSystem radioSystem, int32_t id) const
|
||||
if (!m_profile)
|
||||
return false;
|
||||
|
||||
for (const auto &cnrTvcProfileData : m_profile->data())
|
||||
if (cnrTvcProfileData.radioSystemId() == radioSystem && cnrTvcProfileData.radioCircuitId() == id)
|
||||
for (const auto &cnrTvcProfileData : m_profile->data)
|
||||
if (cnrTvcProfileData.radioSystemId == radioSystem && cnrTvcProfileData.radioCircuitId == id)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
|
||||
Reference in new issue
Block a user