Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 18:06:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Replace deprecated Qt collection functions

Browse source
This commit is contained in:
Dale Glass 2022-06-15 00:02:01 +02:00
parent 22af9ba811
commit 984f11ddf4
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
domain-server/src/DomainGatekeeper.cpp
View file

@ -134,7 +134,7 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointer<ReceivedMessag
nodeData->setSendingSockAddr(message->getSenderSockAddr()); nodeData->setSendingSockAddr(message->getSenderSockAddr());
// guard against patched agents asking to hear about other agents // 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) { if (nodeConnection.nodeType == NodeType::Agent) {
safeInterestSet.remove(NodeType::Agent); safeInterestSet.remove(NodeType::Agent);
} }
@ -1039,7 +1039,7 @@ void DomainGatekeeper::getGroupMemberships(const QString& username) {
return; return;
} }
QJsonArray groupIDs = QJsonArray::fromStringList(groupIDSet.toList()); QJsonArray groupIDs = QJsonArray::fromStringList(groupIDSet.values());
json["groups"] = groupIDs; json["groups"] = groupIDs;
// if we've already asked, wait for the answer before asking again // if we've already asked, wait for the answer before asking again

4
domain-server/src/DomainServer.cpp
View file

@ -1247,7 +1247,7 @@ void DomainServer::processListRequestPacket(QSharedPointer<ReceivedMessage> mess
} }
// guard against patched agents asking to hear about other agents // 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) { if (sendingNode->getType() == NodeType::Agent) {
safeInterestSet.remove(NodeType::Agent); safeInterestSet.remove(NodeType::Agent);
} }
@ -3460,7 +3460,7 @@ void DomainServer::addStaticAssignmentsToQueue() {
auto sharedAssignments = _allAssignments.values(); auto sharedAssignments = _allAssignments.values();
// sort the assignments to put the server/mixer assignments first // 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()) { if (a->getType() == b->getType()) {
return true; return true;
} else if (a->getType() != Assignment::AgentType && b->getType() != Assignment::AgentType) { } else if (a->getType() != Assignment::AgentType && b->getType() != Assignment::AgentType) {

10
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -1976,7 +1976,7 @@ QStringList DomainServerSettingsManager::getAllKnownGroupNames() {
result += entry.first.first; result += entry.first.first;
} }
return result.toList(); return result.values();
} }
bool DomainServerSettingsManager::setGroupID(const QString& groupName, const QUuid& groupID) { bool DomainServerSettingsManager::setGroupID(const QString& groupName, const QUuid& groupID) {
@ -2225,7 +2225,7 @@ QList<QUuid> DomainServerSettingsManager::getGroupIDs() {
result += _groupPermissions[groupKey]->getGroupID(); result += _groupPermissions[groupKey]->getGroupID();
} }
} }
return result.toList(); return result.values();
} }
QList<QUuid> DomainServerSettingsManager::getBlacklistGroupIDs() { QList<QUuid> DomainServerSettingsManager::getBlacklistGroupIDs() {
@ -2235,7 +2235,7 @@ QList<QUuid> DomainServerSettingsManager::getBlacklistGroupIDs() {
result += _groupForbiddens[groupKey]->getGroupID(); result += _groupForbiddens[groupKey]->getGroupID();
} }
} }
return result.toList(); return result.values();
} }
QStringList DomainServerSettingsManager::getDomainServerGroupNames() { QStringList DomainServerSettingsManager::getDomainServerGroupNames() {
@ -2244,7 +2244,7 @@ QStringList DomainServerSettingsManager::getDomainServerGroupNames() {
foreach(NodePermissionsKey groupKey, _groupPermissions.keys()) { foreach(NodePermissionsKey groupKey, _groupPermissions.keys()) {
result += _groupPermissions[groupKey]->getID(); result += _groupPermissions[groupKey]->getID();
} }
return result.toList(); return result.values();
} }
QStringList DomainServerSettingsManager::getDomainServerBlacklistGroupNames() { QStringList DomainServerSettingsManager::getDomainServerBlacklistGroupNames() {
@ -2253,7 +2253,7 @@ QStringList DomainServerSettingsManager::getDomainServerBlacklistGroupNames() {
foreach (NodePermissionsKey groupKey, _groupForbiddens.keys()) { foreach (NodePermissionsKey groupKey, _groupForbiddens.keys()) {
result += _groupForbiddens[groupKey]->getID(); result += _groupForbiddens[groupKey]->getID();
} }
return result.toList(); return result.values();
} }
void DomainServerSettingsManager::debugDumpGroupsState() { void DomainServerSettingsManager::debugDumpGroupsState() {

2
tools/vhacd-util/src/VHACDUtil.cpp
View file

@ -25,7 +25,7 @@ bool HFMModelLessThan(const HFMMesh& e1, const HFMMesh& e2) {
return e1.meshIndex < e2.meshIndex; return e1.meshIndex < e2.meshIndex;
} }
void reSortHFMModelMeshes(HFMModel& hfmModel) { void reSortHFMModelMeshes(HFMModel& hfmModel) {
qSort(hfmModel.meshes.begin(), hfmModel.meshes.end(), HFMModelLessThan); std::sort(hfmModel.meshes.begin(), hfmModel.meshes.end(), HFMModelLessThan);
} }