From 12fdec232b468d40260717e09ef747b8ca90121a Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 28 Aug 2015 16:31:02 +0200 Subject: [PATCH] CR --- assignment-client/src/assets/AssetServer.cpp | 2 +- libraries/networking/src/AssetRequest.cpp | 1 - libraries/networking/src/AssetResourceRequest.cpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp index 1332ddf7f4..8c4807f412 100644 --- a/assignment-client/src/assets/AssetServer.cpp +++ b/assignment-client/src/assets/AssetServer.cpp @@ -114,7 +114,7 @@ void AssetServer::handleAssetGetInfo(QSharedPointer packet, SharedNode replyPacket->writePrimitive(AssetServerError::NO_ERROR); replyPacket->writePrimitive(fileInfo.size()); } else { - qDebug() << "Asset not found: " << assetHash.toHex(); + qDebug() << "Asset not found: " << QString(hexHash); replyPacket->writePrimitive(AssetServerError::ASSET_NOT_FOUND); } diff --git a/libraries/networking/src/AssetRequest.cpp b/libraries/networking/src/AssetRequest.cpp index 2d2a15bd60..69bf86302c 100644 --- a/libraries/networking/src/AssetRequest.cpp +++ b/libraries/networking/src/AssetRequest.cpp @@ -57,7 +57,6 @@ void AssetRequest::start() { qCDebug(networking) << "Got size of " << _hash << " : " << info.size << " bytes"; - // Round up int start = 0, end = _info.size; auto assetClient = DependencyManager::get(); diff --git a/libraries/networking/src/AssetResourceRequest.cpp b/libraries/networking/src/AssetResourceRequest.cpp index 4172990d86..93c1b49329 100644 --- a/libraries/networking/src/AssetResourceRequest.cpp +++ b/libraries/networking/src/AssetResourceRequest.cpp @@ -29,7 +29,6 @@ void AssetResourceRequest::doSend() { connect(request, &AssetRequest::progress, this, &AssetResourceRequest::progress); QObject::connect(request, &AssetRequest::finished, [this](AssetRequest* req) mutable { - Q_ASSERT(_state == InProgress); Q_ASSERT(req->getState() == AssetRequest::FINISHED);