History

rename MenuType and other CR feedback

ZappoMan committed 12 years ago

Commit 3943c491 parent 81bff605 files · +12 −13Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 5 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−2
@@ -24,7 +24,7 @@ · 23 unmodified lines
24 24
25#include <Sound.h>25#include <Sound.h>
26 26
27#include "MenuTypes.h"27#include "MenuItemProperties.h"
28#include "ScriptEngine.h"28#include "ScriptEngine.h"
29 29
30const unsigned int VISUAL_DATA_CALLBACK_USECS = (1.0 / 60.0) * 1000 * 1000;30const unsigned int VISUAL_DATA_CALLBACK_USECS = (1.0 / 60.0) * 1000 * 1000;
@@ -138,7 +138,7 @@ void ScriptEngine::init() { · 107 unmodified lines
138 registerMetaTypes(&_engine);138 registerMetaTypes(&_engine);
139 registerVoxelMetaTypes(&_engine);139 registerVoxelMetaTypes(&_engine);
140 registerEventTypes(&_engine);140 registerEventTypes(&_engine);
141 registerMenuTypes(&_engine);141 registerMenuItemProperties(&_engine);
142 142
143 qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);143 qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);
144 qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);144 qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);