lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
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:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/avs_session_context.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ struct AvsSessionContext::Composite
, audioPrioObserver(exerciseId_, operatorId, exerciseContextHandle.opmDtc(), exerciseContextHandle.exmDtc())
, avaComm(NGL::Connections::hostName(NGL::Connections::eConnection::AVS_WORKSTATION), NGL::Connections::port(NGL::Connections::eConnection::AVS_WORKSTATION))
, avaControl(&avaComm, exerciseContextHandle.streamNameMapping(), PluginSettings::instance()->avaTimeout())
, avaSession(&avaControl, exerciseId, QString::fromStdString(operator_.name()), langCode, operator_.audioChannelPriority(), audioPrioObserver.timezone(), guiStyle, PluginSettings::instance()->avaKeepAliveEnabled())
, avaSession(&avaControl, exerciseId, QString::fromStdString(operator_.name), langCode, operator_.audioChannelPriority, audioPrioObserver.timezone(), guiStyle, PluginSettings::instance()->avaKeepAliveEnabled())
, avaState(&avaSession)
, streamNameMappingToAva(&avaSession, exerciseContextHandle.streamNameMapping())
, avsMenus(&avaSession, exerciseContextHandle.dtc().get(), exerciseContextHandle.ismDtc(), avaState.rtState())
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/operator_settings_observer.cpp
+8 -8
View File
@@ -80,12 +80,12 @@ OperatorSettingsObserver::OperatorSettingsObserver(int exerciseId, int operatorI
Q_ASSERT(exmDtc);
OperatorManagement::User operator_ = m_opmDtc->user(operatorId);
if (operator_.id() == operatorId)
m_currentPrio = operator_.audioChannelPriority();
if (operator_.id == operatorId)
m_currentPrio = operator_.audioChannelPriority;
ExerciseManagement::Exercise exercise = m_exmDtc->exercise(exerciseId);
if (exercise.id() == exerciseId)
m_timezoneCalculator->setDefaultTimezone(QChar::fromLatin1(exercise.defaultTimeZone()));
if (exercise.id == exerciseId)
m_timezoneCalculator->setDefaultTimezone(QChar::fromLatin1(exercise.defaultTimeZone));
connect(opmDtc, &OperatorManagement::Interface::Dtc::userChanged, this, &OperatorSettingsObserver::onOperatorChanged);
connect(exmDtc, &ExerciseManagement::Interface::Dtc::exerciseChanged, this, &OperatorSettingsObserver::onExerciseChanged);
@@ -109,10 +109,10 @@ void OperatorSettingsObserver::onOperatorChanged(const OperatorManagement::User
case DataModification::eModified:
{
if (operator_.id() != m_operatorId)
if (operator_.id != m_operatorId)
return;
AvaAudioPrio prio = operator_.audioChannelPriority();
AvaAudioPrio prio = operator_.audioChannelPriority;
if (prio == m_currentPrio)
return;
@@ -131,13 +131,13 @@ void OperatorSettingsObserver::onOperatorChanged(const OperatorManagement::User
void OperatorSettingsObserver::onExerciseChanged(const ExerciseManagement::Exercise &exercise, DataModification modType)
{
if (exercise.id() != m_exerciseId)
if (exercise.id != m_exerciseId)
return;
switch (modType)
{
case DataModification::eModified:
m_timezoneCalculator->setDefaultTimezone(QChar::fromLatin1(exercise.defaultTimeZone()));
m_timezoneCalculator->setDefaultTimezone(QChar::fromLatin1(exercise.defaultTimeZone));
break;
default:
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/rt_profile_observer.cpp
+14 -14
View File
@@ -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;