From cd901f9e3283b5d8f858b3e4b476aa2d0ea58c02 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Mon, 7 Sep 2020 23:52:33 +0200 Subject: [PATCH] Move enum into ExternalResources namespace --- interface/src/Application.cpp | 3 ++- libraries/networking/src/ExternalResource.cpp | 1 - libraries/networking/src/ExternalResource.h | 2 -- libraries/script-engine/src/ScriptEngine.h | 2 ++ scripts/system/create/edit.js | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ee9cd212a3..4fe492d60d 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -7537,8 +7537,9 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptEngine scriptEngine->registerGlobalObject("HifiAbout", AboutUtil::getInstance()); // Deprecated. scriptEngine->registerGlobalObject("ResourceRequestObserver", DependencyManager::get().data()); - scriptEngine->registerEnum("Bucket", QMetaEnum::fromType()); + scriptEngine->registerGlobalObject("ExternalResource", ExternalResource::getInstance()); + scriptEngine->registerEnum("ExternalResource.Bucket", QMetaEnum::fromType()); registerInteractiveWindowMetaType(scriptEngine.data()); diff --git a/libraries/networking/src/ExternalResource.cpp b/libraries/networking/src/ExternalResource.cpp index 9b816ece9f..884bcbb4be 100644 --- a/libraries/networking/src/ExternalResource.cpp +++ b/libraries/networking/src/ExternalResource.cpp @@ -21,7 +21,6 @@ ExternalResource::ExternalResource(QObject *parent) : QObject(parent) { } - ExternalResource * ExternalResource::getInstance() { static ExternalResource instance; return &instance; diff --git a/libraries/networking/src/ExternalResource.h b/libraries/networking/src/ExternalResource.h index c07208c452..71ba4f8162 100644 --- a/libraries/networking/src/ExternalResource.h +++ b/libraries/networking/src/ExternalResource.h @@ -16,7 +16,6 @@ #include #include - /** * Flexible management for external resources * @@ -39,7 +38,6 @@ class ExternalResource : public QObject { static ExternalResource *getInstance(); ~ExternalResource() {}; - /** * Bucket from which to retrieve the resource * diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h index 2a30cc1ed2..ec538e8fa8 100644 --- a/libraries/script-engine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -235,6 +235,8 @@ public: * @function Script.registerEnum * @param {string} enumName - Name. * @param {object} newEnum - Enumeration to be added + * @warning This function must be called after a registerGlobalObject that creates the namespace this enum is located in, + * or the globalObject won't function. Eg, if you have a Foo object and a Foo.FooType enum, Foo must be registered first. * @deprecated This function is deprecated and will be removed. */ /// registers a global enum diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js index 9b071c2b73..b5dd95fb3b 100644 --- a/scripts/system/create/edit.js +++ b/scripts/system/create/edit.js @@ -44,8 +44,8 @@ var CREATE_TOOLS_WIDTH = 490; var MAX_DEFAULT_ENTITY_LIST_HEIGHT = 942; var ENTIRE_DOMAIN_SCAN_RADIUS = 27713; -var DEFAULT_IMAGE = ExternalResource.getUrl(Bucket.Assets, "interface/default/default_image.jpg"); -var DEFAULT_PARTICLE = ExternalResource.getUrl(Bucket.Assets, "interface/default/default_particle.png"); +var DEFAULT_IMAGE = ExternalResource.getUrl(ExternalResource.Bucket.Assets, "interface/default/default_image.jpg"); +var DEFAULT_PARTICLE = ExternalResource.getUrl(ExternalResource.Bucket.Assets, "interface/default/default_particle.png"); var createToolsWindow = new CreateWindow( Script.resolvePath("qml/EditTools.qml"),