History

Better enum registration

Dale Glass committed 6 years ago

Commit 26bcaa41 parent c65cc953 files · +24 −7Browse files

Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all

Unified · Split

interface/src/Application.cpp+1−7
@@ -7537,13 +7537,7 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptEngine · 7536 unmodified lines
7537 scriptEngine->registerGlobalObject("HifiAbout", AboutUtil::getInstance()); // Deprecated.7537 scriptEngine->registerGlobalObject("HifiAbout", AboutUtil::getInstance()); // Deprecated.
7538 scriptEngine->registerGlobalObject("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());7538 scriptEngine->registerGlobalObject("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
7539 7539
7540 // This is obviously wrong -- FIXME!7540 scriptEngine->registerEnum("Bucket", QMetaEnum::fromType<ExternalResource::Bucket>());
7541 scriptEngine->registerValue("Bucket.Public", static_cast<int>(ExternalResource::Bucket::Public));
7542 scriptEngine->registerValue("Bucket.Content", static_cast<int>(ExternalResource::Bucket::Content));
7543 scriptEngine->registerValue("Bucket.MPAssets", static_cast<int>(ExternalResource::Bucket::MPAssets));
7544 scriptEngine->registerValue("Bucket.Assets", static_cast<int>(ExternalResource::Bucket::Assets));
7545
7546
7547 scriptEngine->registerGlobalObject("ExternalResource", ExternalResource::getInstance());7541 scriptEngine->registerGlobalObject("ExternalResource", ExternalResource::getInstance());
7548 7542
7549 registerInteractiveWindowMetaType(scriptEngine.data());7543 registerInteractiveWindowMetaType(scriptEngine.data());

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t