From 984f11ddf40eb8678fd42a310d7fbd6b38d61919 Mon Sep 17 00:00:00 2001
From: Dale Glass <dale@daleglass.net>
Date: Wed, 15 Jun 2022 00:02:01 +0200
Subject: [PATCH] Replace deprecated Qt collection functions

---
 domain-server/src/DomainGatekeeper.cpp            |  4 ++--
 domain-server/src/DomainServer.cpp                |  4 ++--
 domain-server/src/DomainServerSettingsManager.cpp | 10 +++++-----
 tools/vhacd-util/src/VHACDUtil.cpp                |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp
index aae7b8df4e..b52fb2ee2e 100644
--- a/domain-server/src/DomainGatekeeper.cpp
+++ b/domain-server/src/DomainGatekeeper.cpp
@@ -134,7 +134,7 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointer<ReceivedMessag
         nodeData->setSendingSockAddr(message->getSenderSockAddr());
 
         // guard against patched agents asking to hear about other agents
-        auto safeInterestSet = nodeConnection.interestList.toSet();
+        auto safeInterestSet = QSet<NodeType_t>(nodeConnection.interestList.begin(), nodeConnection.interestList.end());
         if (nodeConnection.nodeType == NodeType::Agent) {
             safeInterestSet.remove(NodeType::Agent);
         }
@@ -1039,7 +1039,7 @@ void DomainGatekeeper::getGroupMemberships(const QString& username) {
         return;
     }
 
-    QJsonArray groupIDs = QJsonArray::fromStringList(groupIDSet.toList());
+    QJsonArray groupIDs = QJsonArray::fromStringList(groupIDSet.values());
     json["groups"] = groupIDs;
 
     // if we've already asked, wait for the answer before asking again
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 0c9750775a..fa7298815e 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1247,7 +1247,7 @@ void DomainServer::processListRequestPacket(QSharedPointer<ReceivedMessage> mess
     }
 
     // guard against patched agents asking to hear about other agents
-    auto safeInterestSet = nodeRequestData.interestList.toSet();
+    auto safeInterestSet = QSet<NodeType_t>(nodeRequestData.interestList.begin(), nodeRequestData.interestList.end());
     if (sendingNode->getType() == NodeType::Agent) {
         safeInterestSet.remove(NodeType::Agent);
     }
@@ -3460,7 +3460,7 @@ void DomainServer::addStaticAssignmentsToQueue() {
     auto sharedAssignments = _allAssignments.values();
 
     // sort the assignments to put the server/mixer assignments first
-    qSort(sharedAssignments.begin(), sharedAssignments.end(), [](SharedAssignmentPointer a, SharedAssignmentPointer b){
+    std::sort(sharedAssignments.begin(), sharedAssignments.end(), [](SharedAssignmentPointer a, SharedAssignmentPointer b){
         if (a->getType() == b->getType()) {
             return true;
         } else if (a->getType() != Assignment::AgentType && b->getType() != Assignment::AgentType) {
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index c1bc48764b..cd48999830 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -1976,7 +1976,7 @@ QStringList DomainServerSettingsManager::getAllKnownGroupNames() {
         result += entry.first.first;
     }
 
-    return result.toList();
+    return result.values();
 }
 
 bool DomainServerSettingsManager::setGroupID(const QString& groupName, const QUuid& groupID) {
@@ -2225,7 +2225,7 @@ QList<QUuid> DomainServerSettingsManager::getGroupIDs() {
             result += _groupPermissions[groupKey]->getGroupID();
         }
     }
-    return result.toList();
+    return result.values();
 }
 
 QList<QUuid> DomainServerSettingsManager::getBlacklistGroupIDs() {
@@ -2235,7 +2235,7 @@ QList<QUuid> DomainServerSettingsManager::getBlacklistGroupIDs() {
             result += _groupForbiddens[groupKey]->getGroupID();
         }
     }
-    return result.toList();
+    return result.values();
 }
 
 QStringList DomainServerSettingsManager::getDomainServerGroupNames() {
@@ -2244,7 +2244,7 @@ QStringList DomainServerSettingsManager::getDomainServerGroupNames() {
     foreach(NodePermissionsKey groupKey, _groupPermissions.keys()) {
         result += _groupPermissions[groupKey]->getID();
     }
-    return result.toList();
+    return result.values();
 }
 
 QStringList DomainServerSettingsManager::getDomainServerBlacklistGroupNames() {
@@ -2253,7 +2253,7 @@ QStringList DomainServerSettingsManager::getDomainServerBlacklistGroupNames() {
     foreach (NodePermissionsKey groupKey, _groupForbiddens.keys()) {
         result += _groupForbiddens[groupKey]->getID();
     }
-    return result.toList();
+    return result.values();
 }
 
 void DomainServerSettingsManager::debugDumpGroupsState() {
diff --git a/tools/vhacd-util/src/VHACDUtil.cpp b/tools/vhacd-util/src/VHACDUtil.cpp
index a5ad5bc891..c89b05555e 100644
--- a/tools/vhacd-util/src/VHACDUtil.cpp
+++ b/tools/vhacd-util/src/VHACDUtil.cpp
@@ -25,7 +25,7 @@ bool HFMModelLessThan(const HFMMesh& e1, const HFMMesh& e2) {
     return e1.meshIndex < e2.meshIndex;
 }
 void reSortHFMModelMeshes(HFMModel& hfmModel) {
-    qSort(hfmModel.meshes.begin(), hfmModel.meshes.end(), HFMModelLessThan);
+    std::sort(hfmModel.meshes.begin(), hfmModel.meshes.end(), HFMModelLessThan);
 }