Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
@@ -42,7 +42,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOpmCommon
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
ddscore
|
||||
ngldb
|
||||
LtsUtilsCore
|
||||
@@ -159,7 +159,7 @@ CODEGEN_SQL(SRCS_exe ${xml_FILE})
|
||||
NGL_ADD_SVC_ICON(SRCS_exe)
|
||||
NGL_ADD_EXECUTABLE(AAR SV svcOperatorManagement ${SRCS_exe})
|
||||
NGL_TARGET_LINK_LIBRARIES(svcOperatorManagement
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
ddsfts
|
||||
svcAsmClient
|
||||
svcCoreClient
|
||||
|
||||
+2
-2
@@ -17,8 +17,8 @@ IF(BUILD_TESTING)
|
||||
# Testing FunctionTopic Functionality (FTC)
|
||||
ADD_EXECUTABLE(opmTests ${SRCS_OPM_TEST} ${HDRS_OPM_TEST})
|
||||
TARGET_LINK_LIBRARIES(opmTests
|
||||
Qt5::Core
|
||||
Qt5::Test
|
||||
Qt6::Core
|
||||
Qt6::Test
|
||||
RTI::nddscpp2
|
||||
svcOpmClient
|
||||
LtsCommandLineParser
|
||||
|
||||
+2
-1
@@ -9,6 +9,7 @@
|
||||
|
||||
|
||||
#include "handler_active_apps.h"
|
||||
#include <utility>
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "main_handler.h"
|
||||
@@ -69,7 +70,7 @@ void HandlerActiveApps::cleanupOperator(int operatorId)
|
||||
void HandlerActiveApps::cleanup()
|
||||
{
|
||||
auto dtsPtr = dts();
|
||||
for (const ActiveApp &item : qAsConst(m_activeApps))
|
||||
for (const ActiveApp &item : std::as_const(m_activeApps))
|
||||
dtsPtr->removeActiveAppByKey(item.id());
|
||||
m_activeApps.clear();
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "handler_group.h"
|
||||
#include <utility>
|
||||
#include "object_group.h"
|
||||
#include "handler_operator.h"
|
||||
#include "opm_db.h"
|
||||
@@ -152,7 +153,7 @@ Core::FunctionReplyObject HandlerGroup::create(const GroupCreateRequest &request
|
||||
{
|
||||
Database::OpmGroup group;
|
||||
group.name = QString::fromStdString(request.name());
|
||||
for (const ObjectGroup *g : qAsConst(m_groupObjMap))
|
||||
for (const ObjectGroup *g : std::as_const(m_groupObjMap))
|
||||
{
|
||||
if (g->name().compare(group.name, Qt::CaseInsensitive) == 0)
|
||||
return Core::FunctionReplyObject(-1, tr_lts("dds", "Name '%1' already exists")).arg(group.name);
|
||||
@@ -193,7 +194,7 @@ Core::FunctionReplyObject HandlerGroup::changeName(const OperatorManagement::Gro
|
||||
group.name = QString::fromStdString(request.name());
|
||||
group.description = QString::fromStdString(request.description());
|
||||
|
||||
for (const ObjectGroup *g : qAsConst(m_groupObjMap))
|
||||
for (const ObjectGroup *g : std::as_const(m_groupObjMap))
|
||||
{
|
||||
if (g == ifs)
|
||||
continue;
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "handler_operator.h"
|
||||
#include <utility>
|
||||
#include "handler_locked_topics.h"
|
||||
#include "handler_active_apps.h"
|
||||
#include "object_operator.h"
|
||||
@@ -75,7 +76,7 @@ bool HandlerOperator::init()
|
||||
|
||||
OperatorManagement::OperatorWorkstationAlive alive;
|
||||
alive.lastAlive(QDateTime::currentMSecsSinceEpoch());
|
||||
for (const Database::OpmOperator &op : qAsConst(dataVec))
|
||||
for (const Database::OpmOperator &op : std::as_const(dataVec))
|
||||
{
|
||||
ObjectOperator *ifs(new ObjectOperator(m_mainHandler));
|
||||
Core::FunctionReplyObject ret = ifs->createObject(op, opMap[op.id]);
|
||||
@@ -299,7 +300,7 @@ Core::FunctionReplyObject HandlerOperator::operatorModifyRequest(const OperatorC
|
||||
{
|
||||
op.name = QString::fromStdString(request.name().get());
|
||||
|
||||
for (const ObjectOperator *o : qAsConst(m_operatorObjMap))
|
||||
for (const ObjectOperator *o : std::as_const(m_operatorObjMap))
|
||||
{
|
||||
if (o == ifs)
|
||||
continue;
|
||||
@@ -619,7 +620,7 @@ Core::FunctionReplyObject HandlerOperator::operatorUpdateVisiblePartiesByExercis
|
||||
|
||||
void HandlerOperator::reloadAcls()
|
||||
{
|
||||
for (ObjectOperator *ifs : qAsConst(m_operatorObjMap))
|
||||
for (ObjectOperator *ifs : std::as_const(m_operatorObjMap))
|
||||
ifs->reloadAcls();
|
||||
}
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
*/
|
||||
|
||||
#include "object_operator.h"
|
||||
#include <utility>
|
||||
|
||||
#include "main_handler.h"
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
@@ -292,7 +293,7 @@ QSet<int> ObjectOperator::calculateEffectiveAcls() const
|
||||
QSet<int> allowances;
|
||||
QSet<int> denials;
|
||||
|
||||
for (int group : qAsConst(effectiveGroups))
|
||||
for (int group : std::as_const(effectiveGroups))
|
||||
{
|
||||
addValuesToSet(allowMap, group, allowances);
|
||||
addValuesToSet(denyMap, group, denials);
|
||||
|
||||
+6
-5
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
#include "opm_dtc_impl_custom.h"
|
||||
#include <utility>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
@@ -30,7 +31,7 @@ QVector<int> DtcImplCustom::getOperatorsByOperatorRight(int operatorRight)
|
||||
QVector<int> ret;
|
||||
|
||||
DEBUG_LOG(m_logger) << "OperatorRight: " << operatorRight;
|
||||
for (const User &user : qAsConst(m_userCont))
|
||||
for (const User &user : std::as_const(m_userCont))
|
||||
{
|
||||
for (int acl : user.effectiveAcls())
|
||||
{
|
||||
@@ -52,7 +53,7 @@ QVector<int> DtcImplCustom::operatorForExerciseParty(int exerciseId, int partyId
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " exerciseId: " << exerciseId << ", partyId: " << partyId;
|
||||
|
||||
for (const User &user : qAsConst(m_userCont))
|
||||
for (const User &user : std::as_const(m_userCont))
|
||||
{
|
||||
const auto visiblePartiesByExercise = user.visiblePartiesByExercise();
|
||||
for (const auto &pbe : visiblePartiesByExercise)
|
||||
@@ -113,7 +114,7 @@ bool DtcImplCustom::sendAdlerNotification(const QString &jsonStr, const int exer
|
||||
DEBUG_LOG(m_logger) << "sendAdlerNotification";
|
||||
|
||||
const QJsonArray &exercisesArr = doc.object().value(QStringLiteral("Exercises")).toArray();
|
||||
for (const QJsonValue &exercisesVal : qAsConst(exercisesArr))
|
||||
for (const QJsonValue &exercisesVal : std::as_const(exercisesArr))
|
||||
{
|
||||
const QJsonObject exercisesObj = exercisesVal.toObject();
|
||||
|
||||
@@ -135,7 +136,7 @@ bool DtcImplCustom::sendAdlerNotification(const QString &jsonStr, const int exer
|
||||
// 2. Array durchlaufen
|
||||
QJsonArray notifications = exercisesObj.value(QStringLiteral("suppressNotifications")).toArray();
|
||||
|
||||
for (const QJsonValue &val : qAsConst(notifications))
|
||||
for (const QJsonValue &val : std::as_const(notifications))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "sendAdlerNotification notifications";
|
||||
const QJsonObject entry = val.toObject();
|
||||
@@ -169,7 +170,7 @@ QVector<int> DtcImplCustom::getNotificationRecipents(const int exerciseId, const
|
||||
bool inExercise = false;
|
||||
const auto user = m_userCont.value(userId);
|
||||
// Only include operators who are assigned to the exercise.
|
||||
for (const auto &exerciseIdUser : qAsConst(user.exerciseIds()))
|
||||
for (const auto &exerciseIdUser : std::as_const(user.exerciseIds()))
|
||||
{
|
||||
if (exerciseIdUser == exerciseId)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user