diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp index 48f8bb87f9..15e0b8c9b5 100644 --- a/libraries/networking/src/AssetClient.cpp +++ b/libraries/networking/src/AssetClient.cpp @@ -181,7 +181,7 @@ RenameMappingRequest* AssetClient::createRenameMappingRequest(const AssetPath& o return request; } -AssetRequest* AssetClient::createRequest(const AssetHash& hash, ByteRange byteRange) { +AssetRequest* AssetClient::createRequest(const AssetHash& hash, const ByteRange& byteRange) { auto request = new AssetRequest(hash, byteRange); // Move to the AssetClient thread in case we are not currently on that thread (which will usually be the case) diff --git a/libraries/networking/src/AssetClient.h b/libraries/networking/src/AssetClient.h index b204fab47e..6f9cc3cd31 100644 --- a/libraries/networking/src/AssetClient.h +++ b/libraries/networking/src/AssetClient.h @@ -56,7 +56,7 @@ public: Q_INVOKABLE DeleteMappingsRequest* createDeleteMappingsRequest(const AssetPathList& paths); Q_INVOKABLE SetMappingRequest* createSetMappingRequest(const AssetPath& path, const AssetHash& hash); Q_INVOKABLE RenameMappingRequest* createRenameMappingRequest(const AssetPath& oldPath, const AssetPath& newPath); - Q_INVOKABLE AssetRequest* createRequest(const AssetHash& hash, ByteRange byteRange = ByteRange()); + Q_INVOKABLE AssetRequest* createRequest(const AssetHash& hash, const ByteRange& byteRange = ByteRange()); Q_INVOKABLE AssetUpload* createUpload(const QString& filename); Q_INVOKABLE AssetUpload* createUpload(const QByteArray& data); diff --git a/libraries/networking/src/AssetRequest.cpp b/libraries/networking/src/AssetRequest.cpp index e54a058ac2..341c3b45da 100644 --- a/libraries/networking/src/AssetRequest.cpp +++ b/libraries/networking/src/AssetRequest.cpp @@ -23,7 +23,7 @@ static int requestID = 0; -AssetRequest::AssetRequest(const QString& hash, ByteRange byteRange) : +AssetRequest::AssetRequest(const QString& hash, const ByteRange& byteRange) : _requestID(++requestID), _hash(hash), _byteRange(byteRange) diff --git a/libraries/networking/src/AssetRequest.h b/libraries/networking/src/AssetRequest.h index e617d75157..b808ae0ca6 100644 --- a/libraries/networking/src/AssetRequest.h +++ b/libraries/networking/src/AssetRequest.h @@ -41,7 +41,7 @@ public: UnknownError }; - AssetRequest(const QString& hash, ByteRange byteRange = ByteRange()); + AssetRequest(const QString& hash, const ByteRange& byteRange = ByteRange()); virtual ~AssetRequest() override; Q_INVOKABLE void start(); @@ -65,7 +65,7 @@ private: QByteArray _data; int _numPendingRequests { 0 }; MessageID _assetRequestID { INVALID_MESSAGE_ID }; - ByteRange _byteRange; + const ByteRange _byteRange; }; #endif diff --git a/libraries/networking/src/ByteRange.h b/libraries/networking/src/ByteRange.h index 77932a8c28..6fd3559154 100644 --- a/libraries/networking/src/ByteRange.h +++ b/libraries/networking/src/ByteRange.h @@ -16,8 +16,8 @@ struct ByteRange { int64_t fromInclusive { 0 }; int64_t toExclusive { 0 }; - bool isSet() { return fromInclusive < 0 || fromInclusive < toExclusive; } - int64_t size() { return toExclusive - fromInclusive; } + bool isSet() const { return fromInclusive < 0 || fromInclusive < toExclusive; } + int64_t size() const { return toExclusive - fromInclusive; } // byte ranges are invalid if: // (1) the toExclusive of the range is negative