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
@@ -142,7 +142,7 @@ void HandlerGroup::onGroupChangeMembershipsRequest(const rti::core::SampleIdenti
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onGroupChangeMembershipsRequest " << request;
|
||||
Core::FunctionReplyObject ret = changeMembership(request);
|
||||
if (request.operatorId.is_set() && request.rolePresetId.is_set())
|
||||
if (request.operatorId.has_value() && request.rolePresetId.has_value())
|
||||
updateRolePresetId(request.operatorId.get(), request.rolePresetId.get());
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
@@ -160,10 +160,10 @@ Core::FunctionReplyObject HandlerGroup::create(const GroupCreateRequest &request
|
||||
}
|
||||
group.description = QString::fromStdString(request.description);
|
||||
group.typeId = request.type;
|
||||
group.isHidden = request.isHidden.is_set() ? request.isHidden.get() : false;
|
||||
group.isHidden = request.isHidden.has_value() ? request.isHidden.get() : false;
|
||||
|
||||
ObjectGroup *ifs(new ObjectGroup(m_mainHandler));
|
||||
Core::FunctionReplyObject ret = ifs->createObject(group, request.memberships.is_set() ? request.memberships.get() : std::vector<int32_t>());
|
||||
Core::FunctionReplyObject ret = ifs->createObject(group, request.memberships.has_value() ? request.memberships.get() : std::vector<int32_t>());
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
|
||||
+23
-23
@@ -186,7 +186,7 @@ void HandlerOperator::onOperatorCreateModifyRequest(const rti::core::SampleIdent
|
||||
{
|
||||
Core::FunctionReplyObject ret;
|
||||
DEBUG_LOG(m_logger) << "onOperatorCreateModifyRequest()";
|
||||
if (!request.id.is_set())
|
||||
if (!request.id.has_value())
|
||||
ret = operatorCreateRequest(request);
|
||||
else
|
||||
ret = operatorModifyRequest(request);
|
||||
@@ -198,8 +198,8 @@ void HandlerOperator::onOperatorCreateModifyRequest(const rti::core::SampleIdent
|
||||
|
||||
Core::FunctionReplyObject HandlerOperator::operatorCreateRequest(const OperatorCreateModifyRequest &request)
|
||||
{
|
||||
if (!request.name.is_set() ||
|
||||
!request.password.is_set())
|
||||
if (!request.name.has_value() ||
|
||||
!request.password.has_value())
|
||||
return Core::FunctionReplyObject(tr_lts("dds", "Can not create operator - name or password is empty."));
|
||||
|
||||
// Group anlegen
|
||||
@@ -215,7 +215,7 @@ Core::FunctionReplyObject HandlerOperator::operatorCreateRequest(const OperatorC
|
||||
// Operator anlegen
|
||||
Database::OpmOperator op;
|
||||
op.name = QString::fromStdString(request.name.get());
|
||||
if (request.description.is_set())
|
||||
if (request.description.has_value())
|
||||
op.description = QString::fromStdString(request.description.get());
|
||||
|
||||
|
||||
@@ -225,22 +225,22 @@ Core::FunctionReplyObject HandlerOperator::operatorCreateRequest(const OperatorC
|
||||
|
||||
op.password = enteredPassword;
|
||||
op.primaryGroupId = groupRet.id();
|
||||
if (request.image.is_set())
|
||||
if (request.image.has_value())
|
||||
op.image = LtsUtils::toQByteArray(request.image.get());
|
||||
const auto vpbe = request.visiblePartiesByExercise;
|
||||
for (const auto &pbe : vpbe)
|
||||
{
|
||||
if (!pbe.visibleParties.is_set() || pbe.exerciseId != 0) //has_value not support on windows yet so we need depricated is_set
|
||||
if (!pbe.visibleParties.has_value() || pbe.exerciseId != 0) //has_value not support on windows yet so we need depricated is_set
|
||||
continue;
|
||||
|
||||
op.visibleParties = LtsUtils::IntArray(pbe.visibleParties.get());
|
||||
}
|
||||
if (request.rolePresetId.is_set())
|
||||
if (request.rolePresetId.has_value())
|
||||
{
|
||||
op.rolePresetId = request.rolePresetId.get();
|
||||
}
|
||||
op.projectionPriority = request.projectionPriority.is_set() ? request.projectionPriority.get() : 1;
|
||||
op.audioChannelPriority = request.audioChannelPriority.is_set() ? request.audioChannelPriority.get() : 1;
|
||||
op.projectionPriority = request.projectionPriority.has_value() ? request.projectionPriority.get() : 1;
|
||||
op.audioChannelPriority = request.audioChannelPriority.has_value() ? request.audioChannelPriority.get() : 1;
|
||||
|
||||
ObjectOperator *ifs(new ObjectOperator(m_mainHandler));
|
||||
const Core::FunctionReplyObject ret = ifs->createObject(op, {});
|
||||
@@ -251,10 +251,10 @@ Core::FunctionReplyObject HandlerOperator::operatorCreateRequest(const OperatorC
|
||||
delete ifs;
|
||||
return ret;
|
||||
}
|
||||
if (request.visibleExercises.is_set())
|
||||
if (request.visibleExercises.has_value())
|
||||
ifs->updateExercises(request.visibleExercises.get());
|
||||
|
||||
if (request.operatorRights.is_set())
|
||||
if (request.operatorRights.has_value())
|
||||
{
|
||||
GroupChangeMembersRequest grChReq;
|
||||
grChReq.id = op.primaryGroupId;
|
||||
@@ -287,7 +287,7 @@ void HandlerOperator::operatorModifyRolePresetId( int operatorId, int rolePreset
|
||||
|
||||
Core::FunctionReplyObject HandlerOperator::operatorModifyRequest(const OperatorCreateModifyRequest &request)
|
||||
{
|
||||
if (request.password.is_set())
|
||||
if (request.password.has_value())
|
||||
return Core::FunctionReplyObject(tr_lts("dds", "Can not modify operator password with this function."));
|
||||
|
||||
ObjectOperator *ifs = m_operatorObjMap.value(request.id.get());
|
||||
@@ -296,7 +296,7 @@ Core::FunctionReplyObject HandlerOperator::operatorModifyRequest(const OperatorC
|
||||
|
||||
Database::OpmOperator op = ifs->data();
|
||||
|
||||
if (request.name.is_set())
|
||||
if (request.name.has_value())
|
||||
{
|
||||
op.name = QString::fromStdString(request.name.get());
|
||||
|
||||
@@ -309,30 +309,30 @@ Core::FunctionReplyObject HandlerOperator::operatorModifyRequest(const OperatorC
|
||||
}
|
||||
}
|
||||
|
||||
if (request.description.is_set())
|
||||
if (request.description.has_value())
|
||||
op.description = QString::fromStdString(request.description.get());
|
||||
if (request.image.is_set())
|
||||
if (request.image.has_value())
|
||||
op.image = LtsUtils::toQByteArray(request.image.get());
|
||||
const auto vpbe = request.visiblePartiesByExercise;
|
||||
for (const auto &pbe : vpbe)
|
||||
{
|
||||
// only ex0 updated
|
||||
if (!pbe.visibleParties.is_set() || pbe.exerciseId != 0) //has_value not support on windows yet so we need depricated is_set
|
||||
if (!pbe.visibleParties.has_value() || pbe.exerciseId != 0) //has_value not support on windows yet so we need depricated is_set
|
||||
continue;
|
||||
|
||||
op.visibleParties = LtsUtils::IntArray(pbe.visibleParties.get());
|
||||
}
|
||||
|
||||
if (request.rolePresetId.is_set())
|
||||
if (request.rolePresetId.has_value())
|
||||
{
|
||||
op.rolePresetId = request.rolePresetId.get();
|
||||
}
|
||||
|
||||
if (request.visibleExercises.is_set())
|
||||
if (request.visibleExercises.has_value())
|
||||
ifs->updateExercises(request.visibleExercises.get());
|
||||
if (request.projectionPriority.is_set())
|
||||
if (request.projectionPriority.has_value())
|
||||
op.projectionPriority = request.projectionPriority.get();
|
||||
if (request.audioChannelPriority.is_set())
|
||||
if (request.audioChannelPriority.has_value())
|
||||
op.audioChannelPriority = request.audioChannelPriority.get();
|
||||
op.properties = QString::fromStdString(request.properties);
|
||||
|
||||
@@ -526,7 +526,7 @@ void HandlerOperator::onOperatorGetSetSettingsRequest(const rti::core::SampleIde
|
||||
ObjectOperator *ifs = m_operatorObjMap.value(request.id);
|
||||
if (ifs)
|
||||
{
|
||||
if (request.settings.is_set())
|
||||
if (request.settings.has_value())
|
||||
{
|
||||
const auto &data = request.settings.get();
|
||||
const QByteArray settings(QByteArray(reinterpret_cast<const char*>(&data[0]), data.size()));
|
||||
@@ -608,9 +608,9 @@ Core::FunctionReplyObject HandlerOperator::operatorUpdateVisiblePartiesByExercis
|
||||
opEx.operatorId = request.id;
|
||||
opEx.exerciseId = request.exerciseId;
|
||||
std::vector<int> hiddenParties;
|
||||
if (request.hiddenParties.is_set())
|
||||
if (request.hiddenParties.has_value())
|
||||
opEx.hiddenParties = LtsUtils::IntArray(request.hiddenParties.get());
|
||||
if (request.visibleParties.is_set())
|
||||
if (request.visibleParties.has_value())
|
||||
opEx.visibleParties = LtsUtils::IntArray(request.visibleParties.get());
|
||||
|
||||
opEx.properties = QString::fromStdString(request.properties);
|
||||
|
||||
Reference in new issue
Block a user