History

Merging old and new controller interfaces

Brad Davis committed 11 years ago

Commit 0063f9a1 parent 619fce043 files · +1088 −1103Browse files

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

Unified · Split

libraries/script-engine/src/AbstractScriptingServicesInterface.h+5−2
@@ -12,7 +12,10 @@ · 11 unmodified lines
1212 #ifndef hifi_AbstractScriptingServicesInterface_h
1313 #define hifi_AbstractScriptingServicesInterface_h
1414
15−class AbstractControllerScriptingInterface;
15+namespace controller {
16+ class ScriptingInterface;
17+}
18+
1619 class Transform;
1720 class ScriptEngine;
1821 class QThread;
@@ -22,7 +25,7 @@ class AbstractScriptingServicesInterface { · 3 unmodified lines
2225 public:
2326
2427 /// Returns the controller interface for the application
25− virtual AbstractControllerScriptingInterface* getControllerScriptingInterface() = 0;
28+ virtual controller::ScriptingInterface* getControllerScriptingInterface() = 0;
2629
2730 /// Registers application specific services with a script engine.
2831 virtual void registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) = 0;