Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-04 20:50:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move enum into ExternalResources namespace

Browse source
This commit is contained in:
Dale Glass 2020-09-07 23:52:33 +02:00
parent 26bcaa420d
commit cd901f9e32
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -7537,8 +7537,9 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptEngine
scriptEngine->registerGlobalObject("HifiAbout", AboutUtil::getInstance()); // Deprecated. scriptEngine->registerGlobalObject("HifiAbout", AboutUtil::getInstance()); // Deprecated.
scriptEngine->registerGlobalObject("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data()); scriptEngine->registerGlobalObject("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
scriptEngine->registerEnum("Bucket", QMetaEnum::fromType<ExternalResource::Bucket>());
scriptEngine->registerGlobalObject("ExternalResource", ExternalResource::getInstance()); scriptEngine->registerGlobalObject("ExternalResource", ExternalResource::getInstance());
scriptEngine->registerEnum("ExternalResource.Bucket", QMetaEnum::fromType<ExternalResource::Bucket>());
registerInteractiveWindowMetaType(scriptEngine.data()); registerInteractiveWindowMetaType(scriptEngine.data());

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

@ -21,7 +21,6 @@ ExternalResource::ExternalResource(QObject *parent) : QObject(parent) {
} }
ExternalResource * ExternalResource::getInstance() { ExternalResource * ExternalResource::getInstance() {
static ExternalResource instance; static ExternalResource instance;
return &instance; return &instance;

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

@ -16,7 +16,6 @@
#include <QUrl> #include <QUrl>
#include <QMap> #include <QMap>
/** /**
* Flexible management for external resources * Flexible management for external resources
* *
@ -39,7 +38,6 @@ class ExternalResource : public QObject {
static ExternalResource *getInstance(); static ExternalResource *getInstance();
~ExternalResource() {}; ~ExternalResource() {};
/** /**
* Bucket from which to retrieve the resource * Bucket from which to retrieve the resource
* *

2
libraries/script-engine/src/ScriptEngine.h
View file

@ -235,6 +235,8 @@ public:
* @function Script.registerEnum * @function Script.registerEnum
* @param {string} enumName - Name. * @param {string} enumName - Name.
* @param {object} newEnum - Enumeration to be added * @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. * @deprecated This function is deprecated and will be removed.
*/ */
/// registers a global enum /// registers a global enum

4
scripts/system/create/edit.js
View file

@ -44,8 +44,8 @@ var CREATE_TOOLS_WIDTH = 490;
var MAX_DEFAULT_ENTITY_LIST_HEIGHT = 942; var MAX_DEFAULT_ENTITY_LIST_HEIGHT = 942;
var ENTIRE_DOMAIN_SCAN_RADIUS = 27713; var ENTIRE_DOMAIN_SCAN_RADIUS = 27713;
var DEFAULT_IMAGE = ExternalResource.getUrl(Bucket.Assets, "interface/default/default_image.jpg"); var DEFAULT_IMAGE = ExternalResource.getUrl(ExternalResource.Bucket.Assets, "interface/default/default_image.jpg");
var DEFAULT_PARTICLE = ExternalResource.getUrl(Bucket.Assets, "interface/default/default_particle.png"); var DEFAULT_PARTICLE = ExternalResource.getUrl(ExternalResource.Bucket.Assets, "interface/default/default_particle.png");
var createToolsWindow = new CreateWindow( var createToolsWindow = new CreateWindow(
Script.resolvePath("qml/EditTools.qml"), Script.resolvePath("qml/EditTools.qml"),