From 70e9781ad9ae7a1bdb49ea3da0b2d8692adcb445 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 18 Dec 2013 08:42:34 -0800 Subject: [PATCH] CR feedback new class names --- interface/src/Application.h | 4 ++-- ...gInterface.cpp => ControllerScriptingInterface.cpp} | 10 +++++----- ...ptingInterface.h => ControllerScriptingInterface.h} | 6 +++--- ...erface.h => AbstractControllerScriptingInterface.h} | 10 +++++----- libraries/script-engine/src/ScriptEngine.cpp | 2 +- libraries/script-engine/src/ScriptEngine.h | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) rename interface/src/{InterfaceControllerScriptingInterface.cpp => ControllerScriptingInterface.cpp} (72%) rename interface/src/{InterfaceControllerScriptingInterface.h => ControllerScriptingInterface.h} (77%) rename libraries/script-engine/src/{ControllerScriptingInterface.h => AbstractControllerScriptingInterface.h} (57%) diff --git a/interface/src/Application.h b/interface/src/Application.h index 71281659d0..2683d679ed 100644 --- a/interface/src/Application.h +++ b/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 _voxelFades; std::vector _avatarFades; - InterfaceControllerScriptingInterface _controllerScriptingInterface; + ControllerScriptingInterface _controllerScriptingInterface; }; #endif /* defined(__interface__Application__) */ diff --git a/interface/src/InterfaceControllerScriptingInterface.cpp b/interface/src/ControllerScriptingInterface.cpp similarity index 72% rename from interface/src/InterfaceControllerScriptingInterface.cpp rename to interface/src/ControllerScriptingInterface.cpp index a301120d8c..774b671899 100644 --- a/interface/src/InterfaceControllerScriptingInterface.cpp +++ b/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 #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()); diff --git a/interface/src/InterfaceControllerScriptingInterface.h b/interface/src/ControllerScriptingInterface.h similarity index 77% rename from interface/src/InterfaceControllerScriptingInterface.h rename to interface/src/ControllerScriptingInterface.h index 1a9f2ea119..5657a243a8 100644 --- a/interface/src/InterfaceControllerScriptingInterface.h +++ b/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 -#include +#include /// handles scripting of input controller commands from JS -class InterfaceControllerScriptingInterface : public ControllerScriptingInterface { +class ControllerScriptingInterface : public AbstractControllerScriptingInterface { Q_OBJECT public slots: diff --git a/libraries/script-engine/src/ControllerScriptingInterface.h b/libraries/script-engine/src/AbstractControllerScriptingInterface.h similarity index 57% rename from libraries/script-engine/src/ControllerScriptingInterface.h rename to libraries/script-engine/src/AbstractControllerScriptingInterface.h index 10124e588b..37cea60c72 100644 --- a/libraries/script-engine/src/ControllerScriptingInterface.h +++ b/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__ -#define __hifi__ControllerScriptingInterface__ +#ifndef __hifi__AbstractControllerScriptingInterface__ +#define __hifi__AbstractControllerScriptingInterface__ #include #include /// 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__) */ diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index bae63f1a4c..24c4fcf1d9 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/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; diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h index 39ea0d276b..c5172a5772 100644 --- a/libraries/script-engine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -18,7 +18,7 @@ #include #include #include -#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;