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
@@ -92,10 +92,10 @@ Database::AvmCnrConfig toDb(const ModifyCnrConfigRequest &config)
|
||||
result.radioCircuit = QString::fromStdString(config.radioCircuit);
|
||||
result.callSign = QString::fromStdString(config.callSign);
|
||||
result.partyId = config.partyId;
|
||||
if (config.unitId.is_set())
|
||||
if (config.unitId.has_value())
|
||||
result.unitId = config.unitId.get();
|
||||
result.recording = config.recording;
|
||||
if (config.exerciseId.is_set())
|
||||
if (config.exerciseId.has_value())
|
||||
result.exerciseId = config.exerciseId.get();
|
||||
|
||||
return result;
|
||||
@@ -491,7 +491,7 @@ bool CnrHandler::checkConstraint(const std::function<bool (const CnrConfig &)> &
|
||||
// or when both exercises are currently active.
|
||||
// If one is global and one local the constraint must always hold if the local exercise is active
|
||||
// Otherwise the constraint must always hold
|
||||
bool bothLocal = config.exerciseId.is_set() && exerciseId.is_initialized();
|
||||
bool bothLocal = config.exerciseId.has_value() && exerciseId.is_initialized();
|
||||
if (bothLocal)
|
||||
{
|
||||
bool sameExercise = config.exerciseId.get() == *exerciseId;
|
||||
@@ -500,12 +500,12 @@ bool CnrHandler::checkConstraint(const std::function<bool (const CnrConfig &)> &
|
||||
if (!sameExercise && !bothActive)
|
||||
continue;
|
||||
}
|
||||
else if(config.exerciseId.is_set() && !exerciseId.is_initialized())
|
||||
else if(config.exerciseId.has_value() && !exerciseId.is_initialized())
|
||||
{
|
||||
if(!isActiveExercise(config.exerciseId.get()))
|
||||
continue;
|
||||
}
|
||||
else if(exerciseId.is_initialized() && !config.exerciseId.is_set())
|
||||
else if(exerciseId.is_initialized() && !config.exerciseId.has_value())
|
||||
{
|
||||
if(!isActiveExercise(*exerciseId))
|
||||
continue;
|
||||
@@ -663,7 +663,7 @@ bool CnrHandler::isActiveExercise(int exerciseId) const
|
||||
bool CnrHandler::needDeviceConfig(const CnrConfig &config) const
|
||||
{
|
||||
// For global, we always need the config
|
||||
if (!config.exerciseId.is_set())
|
||||
if (!config.exerciseId.has_value())
|
||||
return true;
|
||||
|
||||
int32_t exerciseId = config.exerciseId.get();
|
||||
@@ -703,7 +703,7 @@ bool CnrHandler::haveActiveFrequencyPlanning() const
|
||||
QString CnrHandler::exerciseList(const CnrConfig &config) const
|
||||
{
|
||||
// Local
|
||||
if (config.exerciseId.is_set())
|
||||
if (config.exerciseId.has_value())
|
||||
return ExerciseContext(config.exerciseId.get()).toString();
|
||||
|
||||
// Global - all active exercises, no matter if they have active plannings or not
|
||||
|
||||
Reference in new issue
Block a user