From 3a3b1489c6cfa29631867ff1e5c7d11be3f145e7 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 27 Jul 2016 11:46:52 -0700 Subject: [PATCH] code review --- .../src/DomainServerSettingsManager.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index 39e3c244d8..a02b19f9fd 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -701,19 +701,17 @@ NodePermissions DomainServerSettingsManager::getForbiddensForGroup(const QString if (_groupForbiddens.contains(groupRankKey)) { return *(_groupForbiddens[groupRankKey].get()); } - NodePermissions nullForbiddens; - // XXX should this be setAll(true) ? - nullForbiddens.setAll(false); - return nullForbiddens; + NodePermissions allForbiddens; + allForbiddens.setAll(true); + return allForbiddens; } NodePermissions DomainServerSettingsManager::getForbiddensForGroup(const QUuid& groupID, QUuid rankID) const { GroupByUUIDKey byUUIDKey = GroupByUUIDKey(groupID, rankID); if (!_groupForbiddensByUUID.contains(byUUIDKey)) { - NodePermissions nullForbiddens; - // XXX should this be setAll(true) ? - nullForbiddens.setAll(false); - return nullForbiddens; + NodePermissions allForbiddens; + allForbiddens.setAll(true); + return allForbiddens; } NodePermissionsKey groupKey = _groupForbiddensByUUID[byUUIDKey]->getKey(); @@ -1104,11 +1102,6 @@ bool permissionVariantLessThan(const QVariant &v1, const QVariant &v2) { return v1.toString() < v2.toString(); } - // if (m1.contains("rank_name") && m2.contains("rank_name") && - // m1["permissions_id"].toString() == m2["permissions_id"].toString()) { - // return m1["rank_name"].toString() < m2["rank_name"].toString(); - // } - if (m1.contains("rank_order") && m2.contains("rank_order") && m1["permissions_id"].toString() == m2["permissions_id"].toString()) { return m1["rank_order"].toInt() < m2["rank_order"].toInt();