fix Warning
This commit is contained in:
1 parent
593c221d23
commit
8345470273
316 files changed
+1246
-929
No files matched your search
+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);
|
||||
@@ -352,8 +353,6 @@ std::vector<OperatorManagement::PartiesByExercise> ObjectOperator::toDdsData(con
|
||||
{
|
||||
PartiesByExercise pbe;
|
||||
pbe.exerciseId = ooe.exerciseId;
|
||||
pbe.visibleParties;
|
||||
pbe.hiddenParties;
|
||||
std::vector<int> visibleParty;
|
||||
for (const auto &elem : ooe.visibleParties())
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user