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
+7
-7
@@ -87,7 +87,7 @@ Database::AvmFrequencyPlanning toDb(const FrequencyPlanning &ddsPlan)
|
||||
{
|
||||
Database::AvmFrequencyPlanning dbPlan;
|
||||
dbPlan.id = ddsPlan.id;
|
||||
if (ddsPlan.exerciseId.is_set())
|
||||
if (ddsPlan.exerciseId.has_value())
|
||||
dbPlan.exerciseId = ddsPlan.exerciseId.get();
|
||||
dbPlan.dateOfCreation = ddsPlan.date;
|
||||
dbPlan.frequencySetId = ddsPlan.frequencySetId;
|
||||
@@ -385,8 +385,8 @@ Core::FunctionReplyObject FrequencyPlanningHandler::validateModifyRequest(const
|
||||
|
||||
const FrequencyPlanning &oldPlan = *found;
|
||||
|
||||
if ((oldPlan.exerciseId.is_set() && oldPlan.exerciseId.get() != request.exerciseId)
|
||||
|| (!oldPlan.exerciseId.is_set() && request.exerciseId != 0))
|
||||
if ((oldPlan.exerciseId.has_value() && oldPlan.exerciseId.get() != request.exerciseId)
|
||||
|| (!oldPlan.exerciseId.has_value() && request.exerciseId != 0))
|
||||
return reply.setStr(tr_lts("dds", "Exercise may not be changed"));
|
||||
|
||||
if (request.frequencySetId != oldPlan.frequencySetId)
|
||||
@@ -418,7 +418,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::validateRequest(const Core::
|
||||
return reply.setStr(tr_lts("dds", "FrequencyPlanning %1 does not exist")).arg(request.id);
|
||||
|
||||
const FrequencyPlanning &plan = *foundPlan;
|
||||
int exerciseId = plan.exerciseId.is_set() ? plan.exerciseId.get() : 0;
|
||||
int exerciseId = plan.exerciseId.has_value() ? plan.exerciseId.get() : 0;
|
||||
auto foundActivePlan = m_activePlannings.constFind(exerciseId);
|
||||
bool isActive = foundActivePlan != m_activePlannings.constEnd() && foundActivePlan->frequencyPlanningId == plan.id;
|
||||
if (isActive)
|
||||
@@ -543,7 +543,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::testActivation(const std::ve
|
||||
for (const FrequencyPlanningData &entry : entries)
|
||||
{
|
||||
const CnrConfig &cnrConfig = m_cnrHandler->config(entry.cnrConfigId);
|
||||
bool isGlobal = !cnrConfig.exerciseId.is_set();
|
||||
bool isGlobal = !cnrConfig.exerciseId.has_value();
|
||||
if (!isGlobal)
|
||||
continue;
|
||||
|
||||
@@ -620,7 +620,7 @@ std::vector<int> FrequencyPlanningHandler::takenGlobalCnrConfigs(const std::vect
|
||||
for (const FrequencyPlanningData &entry : plan.data)
|
||||
{
|
||||
const CnrConfig &cnrConfig = m_cnrHandler->config(entry.cnrConfigId);
|
||||
bool isGlobal = !cnrConfig.exerciseId.is_set();
|
||||
bool isGlobal = !cnrConfig.exerciseId.has_value();
|
||||
if (isGlobal)
|
||||
result.push_back(cnrConfig.id);
|
||||
}
|
||||
@@ -775,7 +775,7 @@ void FrequencyPlanningHandler::onCnrConfigRemoved(int cnrConfigId)
|
||||
req.data.erase(found);
|
||||
|
||||
req.date = fp.date;
|
||||
req.exerciseId = fp.exerciseId.is_set() ? fp.exerciseId.get() : 0;
|
||||
req.exerciseId = fp.exerciseId.has_value() ? fp.exerciseId.get() : 0;
|
||||
req.frequencySetId = fp.frequencySetId;
|
||||
req.id = fp.id;
|
||||
req.name = fp.name;
|
||||
|
||||
Reference in new issue
Block a user