Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 02:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace deprecated toList() with values()

Browse source
This commit is contained in:
Dale Glass 2022-06-05 14:55:48 +02:00
parent 87ba20ecb4
commit d5d63f0741
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp
View file

@ -247,7 +247,7 @@ glm::uint32 scriptable::ScriptableMeshPart::fillAttribute(const QString& attribu
QVector<glm::uint32> scriptable::ScriptableMeshPart::findNearbyPartVertexIndices(const glm::vec3& origin, float epsilon) const { QVector<glm::uint32> scriptable::ScriptableMeshPart::findNearbyPartVertexIndices(const glm::vec3& origin, float epsilon) const {
QSet<glm::uint32> result; QSet<glm::uint32> result;
if (!isValid()) { if (!isValid()) {
return result.toList().toVector(); return result.values().toVector();
} }
auto mesh = getMeshPointer(); auto mesh = getMeshPointer();
auto offset = getFirstVertexIndex(); auto offset = getFirstVertexIndex();
@ -266,7 +266,7 @@ QVector<glm::uint32> scriptable::ScriptableMeshPart::findNearbyPartVertexIndices
result << vertexIndex; result << vertexIndex;
} }
} }
return result.toList().toVector(); return result.values().toVector();
} }
scriptable::ScriptableMeshPartPointer scriptable::ScriptableMeshPart::cloneMeshPart() { scriptable::ScriptableMeshPartPointer scriptable::ScriptableMeshPart::cloneMeshPart() {

4
libraries/networking/src/NodeList.cpp
View file

@ -501,8 +501,8 @@ void NodeList::sendDomainServerCheckIn() {
// pack our data to send to the domain-server including // pack our data to send to the domain-server including
// the hostname information (so the domain-server can see which place name we came in on) // the hostname information (so the domain-server can see which place name we came in on)
packetStream << _ownerType.load() << publicSockAddr.getType() << publicSockAddr << localSockAddr.getType() packetStream << _ownerType.load() << publicSockAddr.getType() << publicSockAddr << localSockAddr.getType()
<< localSockAddr << _nodeTypesOfInterest.toList(); << localSockAddr << _nodeTypesOfInterest.values();
packetStream << DependencyManager::get<AddressManager>()->getPlaceName(); packetStream << DependencyManager::get<AddressManager>()->getPlaceName();
if (!domainIsConnected) { if (!domainIsConnected) {