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

 #ifndef hifi_AbstractScriptingServicesInterface_h
 #define hifi_AbstractScriptingServicesInterface_h
-class AbstractControllerScriptingInterface;
+namespace controller {
+    class ScriptingInterface;
+}
 class Transform;
 class ScriptEngine;
 class QThread;
 public:
     /// Returns the controller interface for the application
-    virtual AbstractControllerScriptingInterface* getControllerScriptingInterface() = 0;
+    virtual controller::ScriptingInterface* getControllerScriptingInterface() = 0;
     /// Registers application specific services with a script engine.
     virtual void registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) = 0;