CR feedback new class names

interface/src/Application.h

@@ -69,7 +69,7 @@
 #include "ui/LodToolsDialog.h"
 #include "ParticleTreeRenderer.h"
 #include "ParticleEditHandle.h"
-#include "InterfaceControllerScriptingInterface.h"
+#include "ControllerScriptingInterface.h"
 
 
 class QAction;
@@ -506,7 +506,7 @@ private:
     std::vector<VoxelFade> _voxelFades;
     std::vector<Avatar*> _avatarFades;
     
-    InterfaceControllerScriptingInterface _controllerScriptingInterface;
+    ControllerScriptingInterface _controllerScriptingInterface;
 };
 
 #endif /* defined(__interface__Application__) */

interface/src/ControllerScriptingInterface.cpp

@@ -1,5 +1,5 @@
 //
-//  InterfaceControllerScriptingInterface.h
+//  ControllerScriptingInterface.h
 //  hifi
 //
 //  Created by Brad Hefta-Gaub on 12/17/13
@@ -8,9 +8,9 @@
 
 #include <HandData.h>
 #include "Application.h"
-#include "InterfaceControllerScriptingInterface.h"
+#include "ControllerScriptingInterface.h"
 
-const PalmData* InterfaceControllerScriptingInterface::getPrimaryPalm() const {
+const PalmData* ControllerScriptingInterface::getPrimaryPalm() const {
     int leftPalmIndex, rightPalmIndex;
 
     const HandData* handData = Application::getInstance()->getAvatar()->getHandData();
@@ -23,7 +23,7 @@ const PalmData* InterfaceControllerScriptingInterface::getPrimaryPalm() const {
     return NULL;
 }
 
-bool InterfaceControllerScriptingInterface::isPrimaryButtonPressed() const {
+bool ControllerScriptingInterface::isPrimaryButtonPressed() const {
     const PalmData* primaryPalm = getPrimaryPalm();
     if (primaryPalm) {
         if (primaryPalm->getControllerButtons() & BUTTON_FWD) {
@@ -34,7 +34,7 @@ bool InterfaceControllerScriptingInterface::isPrimaryButtonPressed() const {
     return false;
 }
 
-glm::vec2 InterfaceControllerScriptingInterface::getPrimaryJoystickPosition() const {
+glm::vec2 ControllerScriptingInterface::getPrimaryJoystickPosition() const {
     const PalmData* primaryPalm = getPrimaryPalm();
     if (primaryPalm) {
         return glm::vec2(primaryPalm->getJoystickX(), primaryPalm->getJoystickY());

interface/src/ControllerScriptingInterface.h

@@ -1,5 +1,5 @@
 //
-//  InterfaceControllerScriptingInterface.h
+//  ControllerScriptingInterface.h
 //  hifi
 //
 //  Created by Brad Hefta-Gaub on 12/17/13
@@ -11,10 +11,10 @@
 
 #include <QtCore/QObject>
 
-#include <ControllerScriptingInterface.h>
+#include <AbstractControllerScriptingInterface.h>
 
 /// handles scripting of input controller commands from JS
-class InterfaceControllerScriptingInterface : public ControllerScriptingInterface {
+class ControllerScriptingInterface : public AbstractControllerScriptingInterface {
     Q_OBJECT
 
 public slots:

libraries/script-engine/src/AbstractControllerScriptingInterface.h

@@ -1,19 +1,19 @@
 //
-//  ControllerScriptingInterface.h
+//  AbstractControllerScriptingInterface.h
 //  hifi
 //
 //  Created by Brad Hefta-Gaub on 12/17/13
 //  Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
 //
 
-#ifndef __hifi__ControllerScriptingInterface__
+#ifndef __hifi__AbstractControllerScriptingInterface__
-#define __hifi__ControllerScriptingInterface__
+#define __hifi__AbstractControllerScriptingInterface__
 
 #include <QtCore/QObject>
 #include <glm/glm.hpp>
 
 /// handles scripting of input controller commands from JS
-class ControllerScriptingInterface : public QObject {
+class AbstractControllerScriptingInterface : public QObject {
     Q_OBJECT
 
 public slots:
@@ -21,4 +21,4 @@ public slots:
     virtual glm::vec2 getPrimaryJoystickPosition() const = 0;
 };
 
-#endif /* defined(__hifi__ControllerScriptingInterface__) */
+#endif /* defined(__hifi__AbstractControllerScriptingInterface__) */

libraries/script-engine/src/ScriptEngine.cpp

@@ -26,7 +26,7 @@ int ScriptEngine::_scriptNumber = 1;
 
 ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems,
                                 const char* scriptMenuName, AbstractMenuInterface* menu,
-                                ControllerScriptingInterface* controllerScriptingInterface) {
+                                AbstractControllerScriptingInterface* controllerScriptingInterface) {
     _scriptContents = scriptContents;
     _isFinished = false;
     _isRunning = false;

libraries/script-engine/src/ScriptEngine.h

@@ -18,7 +18,7 @@
 #include <AbstractMenuInterface.h>
 #include <ParticleScriptingInterface.h>
 #include <VoxelScriptingInterface.h>
-#include "ControllerScriptingInterface.h"
+#include "AbstractControllerScriptingInterface.h"
 
 const QString NO_SCRIPT("");
 
@@ -27,7 +27,7 @@ class ScriptEngine : public QObject {
 public:
     ScriptEngine(const QString& scriptContents = NO_SCRIPT, bool wantMenuItems = false, 
                     const char* scriptMenuName = NULL, AbstractMenuInterface* menu = NULL,
-                    ControllerScriptingInterface* controllerScriptingInterface = NULL);
+                    AbstractControllerScriptingInterface* controllerScriptingInterface = NULL);
 
     ~ScriptEngine();
     
@@ -60,7 +60,7 @@ protected:
 private:
     VoxelScriptingInterface _voxelScriptingInterface;
     ParticleScriptingInterface _particleScriptingInterface;
-    ControllerScriptingInterface* _controllerScriptingInterface;
+    AbstractControllerScriptingInterface* _controllerScriptingInterface;
     bool _wantMenuItems;
     QString _scriptMenuName;
     AbstractMenuInterface* _menu;