Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:29:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Applied code formatter

Browse source
This commit is contained in:
Dale Glass 2020-09-10 01:04:54 +02:00
parent 84e01630ee
commit 792854ccb7
2 changed files with 28 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/networking/src/ExternalResource.cpp
View file

@ -13,12 +13,9 @@
#include <QDebug> #include <QDebug>
#include <QLoggingCategory> #include <QLoggingCategory>
Q_LOGGING_CATEGORY(external_resource, "vircadia.networking.external_resource") Q_LOGGING_CATEGORY(external_resource, "vircadia.networking.external_resource")
ExternalResource::ExternalResource(QObject* parent) : QObject(parent) { ExternalResource::ExternalResource(QObject* parent) : QObject(parent) {
} }
ExternalResource* ExternalResource::getInstance() { ExternalResource* ExternalResource::getInstance() {
@ -30,17 +27,20 @@ QUrl ExternalResource::getQUrl(Bucket bucket, const QUrl &relative_path) {
qCDebug(external_resource) << "Requested URL for bucket " << bucket << ", path " << relative_path; qCDebug(external_resource) << "Requested URL for bucket " << bucket << ", path " << relative_path;
if (!_bucketBases.contains(bucket)) { if (!_bucketBases.contains(bucket)) {
qCCritical(external_resource) << "External resource " << relative_path << " was requested from unrecognized bucket " << bucket; qCCritical(external_resource) << "External resource " << relative_path << " was requested from unrecognized bucket "
<< bucket;
return QUrl(); return QUrl();
} }
if (!relative_path.isValid()) { if (!relative_path.isValid()) {
qCCritical(external_resource) << "External resource " << relative_path << " was requested from bucket " << bucket << " with an invalid path. Error: " << relative_path.errorString(); qCCritical(external_resource) << "External resource " << relative_path << " was requested from bucket " << bucket
<< " with an invalid path. Error: " << relative_path.errorString();
return QUrl(); return QUrl();
} }
if (!relative_path.isRelative()) { if (!relative_path.isRelative()) {
qCWarning(external_resource) << "External resource " << relative_path << " was requested from bucket " << bucket << " without using a relative path, returning as-is."; qCWarning(external_resource) << "External resource " << relative_path << " was requested from bucket " << bucket
<< " without using a relative path, returning as-is.";
return relative_path; return relative_path;
} }
@ -48,13 +48,11 @@ QUrl ExternalResource::getQUrl(Bucket bucket, const QUrl &relative_path) {
QUrl base = _bucketBases[bucket]; QUrl base = _bucketBases[bucket];
QUrl merged = base.resolved(relative_path); QUrl merged = base.resolved(relative_path);
qCDebug(external_resource) << "External resource resolved to " << merged; qCDebug(external_resource) << "External resource resolved to " << merged;
return merged; return merged;
} }
QString ExternalResource::getBase(Bucket bucket) { QString ExternalResource::getBase(Bucket bucket) {
std::lock_guard<std::mutex> guard(_bucketMutex); std::lock_guard<std::mutex> guard(_bucketMutex);
return _bucketBases.value(bucket).toString(); return _bucketBases.value(bucket).toString();

10
libraries/networking/src/ExternalResource.h
View file

@ -18,7 +18,6 @@
#include <mutex> #include <mutex>
/** /**
* Flexible management for external resources * Flexible management for external resources
* *
@ -37,7 +36,6 @@ class ExternalResource : public QObject {
Q_OBJECT Q_OBJECT
public: public:
static ExternalResource* getInstance(); static ExternalResource* getInstance();
~ExternalResource(){}; ~ExternalResource(){};
@ -49,7 +47,8 @@ class ExternalResource : public QObject {
* will be done to the Assets bucket instead. This should ease the transition and ensure a clean * will be done to the Assets bucket instead. This should ease the transition and ensure a clean
* separation. * separation.
*/ */
enum class Bucket { enum class Bucket
{
/** Assets that used to be in the hifi-public S3 bucket */ /** Assets that used to be in the hifi-public S3 bucket */
Public, Public,
@ -79,7 +78,6 @@ class ExternalResource : public QObject {
*/ */
QUrl getQUrl(Bucket bucket, const QUrl& relative_path); QUrl getQUrl(Bucket bucket, const QUrl& relative_path);
/** /**
* Returns the location of a resource as a QUrl * Returns the location of a resource as a QUrl
* *
@ -92,9 +90,7 @@ class ExternalResource : public QObject {
* @param relative_path The path of the resource within the bucket * @param relative_path The path of the resource within the bucket
* @returns The resulting URL as a QUrl * @returns The resulting URL as a QUrl
*/ */
QUrl getQUrl(Bucket bucket, QString path) { QUrl getQUrl(Bucket bucket, QString path) { return getQUrl(bucket, QUrl(path)); }
return getQUrl(bucket, QUrl(path));
}
/** /**
* Returns the location of a resource as a QString * Returns the location of a resource as a QString