diff --git a/libraries/animation/src/AnimationCache.cpp b/libraries/animation/src/AnimationCache.cpp index 4e988334f9..237fd3da02 100644 --- a/libraries/animation/src/AnimationCache.cpp +++ b/libraries/animation/src/AnimationCache.cpp @@ -41,7 +41,7 @@ QSharedPointer AnimationCache::createResource(const QUrl& url) { } QSharedPointer AnimationCache::createResourceCopy(const QSharedPointer& resource) { - return QSharedPointer(new Animation(*resource.staticCast().data()), &Resource::deleter); + return QSharedPointer(new Animation(*resource.staticCast()), &Resource::deleter); } AnimationReader::AnimationReader(const QUrl& url, const QByteArray& data) : diff --git a/libraries/audio/src/SoundCache.cpp b/libraries/audio/src/SoundCache.cpp index 343de46e9a..c36897c766 100644 --- a/libraries/audio/src/SoundCache.cpp +++ b/libraries/audio/src/SoundCache.cpp @@ -40,5 +40,5 @@ QSharedPointer SoundCache::createResource(const QUrl& url) { } QSharedPointer SoundCache::createResourceCopy(const QSharedPointer& resource) { - return QSharedPointer(new Sound(*resource.staticCast().data()), &Resource::deleter); + return QSharedPointer(new Sound(*resource.staticCast()), &Resource::deleter); } \ No newline at end of file diff --git a/libraries/material-networking/src/material-networking/MaterialCache.cpp b/libraries/material-networking/src/material-networking/MaterialCache.cpp index bccf1ca0c4..1b5ba6f0f6 100644 --- a/libraries/material-networking/src/material-networking/MaterialCache.cpp +++ b/libraries/material-networking/src/material-networking/MaterialCache.cpp @@ -425,7 +425,7 @@ QSharedPointer MaterialCache::createResource(const QUrl& url) { } QSharedPointer MaterialCache::createResourceCopy(const QSharedPointer& resource) { - return QSharedPointer(new NetworkMaterialResource(*resource.staticCast().data()), &Resource::deleter); + return QSharedPointer(new NetworkMaterialResource(*resource.staticCast()), &Resource::deleter); } NetworkMaterial::NetworkMaterial(const NetworkMaterial& m) : diff --git a/libraries/material-networking/src/material-networking/ShaderCache.cpp b/libraries/material-networking/src/material-networking/ShaderCache.cpp index 8d060c42f2..4c8d659315 100644 --- a/libraries/material-networking/src/material-networking/ShaderCache.cpp +++ b/libraries/material-networking/src/material-networking/ShaderCache.cpp @@ -29,5 +29,5 @@ QSharedPointer ShaderCache::createResource(const QUrl& url) { } QSharedPointer ShaderCache::createResourceCopy(const QSharedPointer& resource) { - return QSharedPointer(new NetworkShader(*resource.staticCast().data()), &Resource::deleter); + return QSharedPointer(new NetworkShader(*resource.staticCast()), &Resource::deleter); } diff --git a/libraries/material-networking/src/material-networking/TextureCache.cpp b/libraries/material-networking/src/material-networking/TextureCache.cpp index 2cc7a4b032..95cf7dfd90 100644 --- a/libraries/material-networking/src/material-networking/TextureCache.cpp +++ b/libraries/material-networking/src/material-networking/TextureCache.cpp @@ -197,16 +197,16 @@ public: namespace std { template <> struct hash { - size_t operator()(const QByteArray& a) const { - return qHash(a); + size_t operator()(const QByteArray& byteArray) const { + return qHash(byteArray); } }; template <> struct hash { - size_t operator()(const TextureExtra& a) const { + size_t operator()(const TextureExtra& textureExtra) const { size_t result = 0; - hash_combine(result, (int)a.type, a.content, a.maxNumPixels); + hash_combine(result, (int)textureExtra.type, textureExtra.content, textureExtra.maxNumPixels); return result; } }; @@ -328,14 +328,13 @@ QSharedPointer TextureCache::createResource(const QUrl& url) { } QSharedPointer TextureCache::createResourceCopy(const QSharedPointer& resource) { - return QSharedPointer(new NetworkTexture(*resource.staticCast().data()), &Resource::deleter); + return QSharedPointer(new NetworkTexture(*resource.staticCast()), &Resource::deleter); } int networkTexturePointerMetaTypeId = qRegisterMetaType>(); NetworkTexture::NetworkTexture(const QUrl& url, bool resourceTexture) : - Resource(url), - _maxNumPixels(100) + Resource(url) { if (resourceTexture) { _textureSource = std::make_shared(url); diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp index 0ed518937d..1a4542d279 100644 --- a/libraries/model-networking/src/model-networking/ModelCache.cpp +++ b/libraries/model-networking/src/model-networking/ModelCache.cpp @@ -76,9 +76,9 @@ namespace std { template <> struct hash { - size_t operator()(const GeometryExtra& a) const { + size_t operator()(const GeometryExtra& geometryExtra) const { size_t result = 0; - hash_combine(result, a.mapping, a.textureBaseUrl, a.combineParts); + hash_combine(result, geometryExtra.mapping, geometryExtra.textureBaseUrl, geometryExtra.combineParts); return result; } }; @@ -394,7 +394,7 @@ QSharedPointer ModelCache::createResource(const QUrl& url) { } QSharedPointer ModelCache::createResourceCopy(const QSharedPointer& resource) { - return QSharedPointer(new GeometryDefinitionResource(*resource.staticCast().data()), &Resource::deleter); + return QSharedPointer(new GeometryDefinitionResource(*resource.staticCast()), &Resource::deleter); } GeometryResource::Pointer ModelCache::getGeometryResource(const QUrl& url, diff --git a/libraries/networking/src/ResourceCache.h b/libraries/networking/src/ResourceCache.h index be514f48f0..9ff8070768 100644 --- a/libraries/networking/src/ResourceCache.h +++ b/libraries/networking/src/ResourceCache.h @@ -489,14 +489,14 @@ protected: QWeakPointer _self; QPointer _cache; - qint64 _bytesReceived{ 0 }; - qint64 _bytesTotal{ 0 }; - qint64 _bytes{ 0 }; + qint64 _bytesReceived { 0 }; + qint64 _bytesTotal { 0 }; + qint64 _bytes { 0 }; int _requestID; - ResourceRequest* _request{ nullptr }; + ResourceRequest* _request { nullptr }; - size_t _extraHash; + size_t _extraHash { std::numeric_limits::max() }; public slots: void handleDownloadProgress(uint64_t bytesReceived, uint64_t bytesTotal); diff --git a/libraries/recording/src/recording/ClipCache.cpp b/libraries/recording/src/recording/ClipCache.cpp index c08dd40ad8..bc20e4d8eb 100644 --- a/libraries/recording/src/recording/ClipCache.cpp +++ b/libraries/recording/src/recording/ClipCache.cpp @@ -54,5 +54,5 @@ QSharedPointer ClipCache::createResource(const QUrl& url) { } QSharedPointer ClipCache::createResourceCopy(const QSharedPointer& resource) { - return QSharedPointer(new NetworkClipLoader(*resource.staticCast().data()), &Resource::deleter); + return QSharedPointer(new NetworkClipLoader(*resource.staticCast()), &Resource::deleter); } \ No newline at end of file