diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp index ff7d869a0b..b63cf41b7c 100644 --- a/assignment-client/src/assets/AssetServer.cpp +++ b/assignment-client/src/assets/AssetServer.cpp @@ -222,8 +222,7 @@ void AssetServer::handleGetMappingOperation(ReceivedMessage& message, SharedNode auto assetHash = it->toString(); replyPacket.writePrimitive(AssetServerError::NoError); replyPacket.write(QByteArray::fromHex(assetHash.toUtf8())); - } - else { + } else { replyPacket.writePrimitive(AssetServerError::AssetNotFound); } } @@ -578,7 +577,7 @@ bool AssetServer::deleteMappings(AssetPathList& paths) { if (sizeBefore != sizeNow) { qDebug() << "Deleted" << sizeBefore - sizeNow << "mappings in folder: " << path; } else { - qDebug() << "Did not find any mappings in folder:" << path; + qDebug() << "Did not find any mappings to delete in folder:" << path; } } else { diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index fda5a0e72d..4777d86d5e 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4459,7 +4459,8 @@ void Application::toggleAssetServerWidget(QString filePath) { return; } - static const QUrl url("AssetServer.qml"); + static const QUrl url { "AssetServer.qml" }; + auto startUpload = [=](QQmlContext* context, QObject* newObject){ if (!filePath.isEmpty()) { emit uploadRequest(filePath); diff --git a/interface/src/scripting/AssetMappingsScriptingInterface.cpp b/interface/src/scripting/AssetMappingsScriptingInterface.cpp index 3c95eb007a..005f8a597c 100644 --- a/interface/src/scripting/AssetMappingsScriptingInterface.cpp +++ b/interface/src/scripting/AssetMappingsScriptingInterface.cpp @@ -225,8 +225,7 @@ void AssetMappingModel::refresh() { lastItem = item; _pathToItemMap[fullPath] = lastItem; - } - else { + } else { lastItem = it.value(); } } diff --git a/libraries/networking/src/AssetResourceRequest.cpp b/libraries/networking/src/AssetResourceRequest.cpp index c9063d7eae..6b94ee152a 100644 --- a/libraries/networking/src/AssetResourceRequest.cpp +++ b/libraries/networking/src/AssetResourceRequest.cpp @@ -26,7 +26,7 @@ AssetResourceRequest::~AssetResourceRequest() { } bool AssetResourceRequest::urlIsAssetHash() const { - static const QString ATP_HASH_REGEX_STRING = "^atp:([A-Fa-f0-9]{64})(\\.[\\w]+)?$"; + static const QString ATP_HASH_REGEX_STRING { "^atp:([A-Fa-f0-9]{64})(\\.[\\w]+)?$" }; QRegExp hashRegex { ATP_HASH_REGEX_STRING }; return hashRegex.exactMatch(_url.toString()); diff --git a/libraries/script-engine/src/AssetScriptingInterface.cpp b/libraries/script-engine/src/AssetScriptingInterface.cpp index aaa4f97fb3..80cd30a8b6 100644 --- a/libraries/script-engine/src/AssetScriptingInterface.cpp +++ b/libraries/script-engine/src/AssetScriptingInterface.cpp @@ -50,10 +50,6 @@ void AssetScriptingInterface::downloadData(QString urlString, QScriptValue callb auto parts = path.split(".", QString::SkipEmptyParts); auto hash = parts.length() > 0 ? parts[0] : ""; - if (hash.length() != SHA256_HASH_HEX_LENGTH) { - return; - } - auto assetClient = DependencyManager::get(); auto assetRequest = assetClient->createRequest(hash);