History

rename voxels and particles scripting interfaces

ZappoMan committed 12 years ago

Commit 651d2d01 parent 505751711 files · +65 −68Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.h+8−8
@@ -16,8 +16,8 @@ · 15 unmodified lines
16#include <QtCore/QUrl>16#include <QtCore/QUrl>
17 17
18#include <AbstractMenuInterface.h>18#include <AbstractMenuInterface.h>
19#include <ParticleScriptingInterface.h>19#include <ParticlesScriptingInterface.h>
20#include <VoxelScriptingInterface.h>20#include <VoxelsScriptingInterface.h>
21#include "AbstractControllerScriptingInterface.h"21#include "AbstractControllerScriptingInterface.h"
22 22
23const QString NO_SCRIPT("");23const QString NO_SCRIPT("");
@@ -31,11 +31,11 @@ public: · 7 unmodified lines
31 31
32 ~ScriptEngine();32 ~ScriptEngine();
33 33
34 /// Access the VoxelScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener34 /// Access the VoxelsScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener
35 VoxelScriptingInterface* getVoxelScriptingInterface() { return &_voxelScriptingInterface; }35 VoxelsScriptingInterface* getVoxelsScriptingInterface() { return &_voxelsScriptingInterface; }
36 36
37 /// Access the ParticleScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener37 /// Access the ParticlesScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener
38 ParticleScriptingInterface* getParticleScriptingInterface() { return &_particleScriptingInterface; }38 ParticlesScriptingInterface* getParticlesScriptingInterface() { return &_particlesScriptingInterface; }
39 39
40 /// sets the script contents, will return false if failed, will fail if script is already running40 /// sets the script contents, will return false if failed, will fail if script is already running
41 bool setScriptContents(const QString& scriptContents);41 bool setScriptContents(const QString& scriptContents);
@@ -58,8 +58,8 @@ protected: · 16 unmodified lines
58 58
59 59
60private:60private:
61 static VoxelScriptingInterface _voxelScriptingInterface;61 static VoxelsScriptingInterface _voxelsScriptingInterface;
62 static ParticleScriptingInterface _particleScriptingInterface;62 static ParticlesScriptingInterface _particlesScriptingInterface;
63 AbstractControllerScriptingInterface* _controllerScriptingInterface;63 AbstractControllerScriptingInterface* _controllerScriptingInterface;
64 bool _wantMenuItems;64 bool _wantMenuItems;
65 QString _scriptMenuName;65 QString _scriptMenuName;