From 3943c49dccebbc0c8973549b22d95e8942e90801 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Tue, 25 Feb 2014 17:32:16 -0800
Subject: [PATCH] rename MenuType and other CR feedback

---
 interface/src/Menu.h                                   |  3 +--
 interface/src/MenuScriptingInterface.h                 |  2 +-
 .../src/{MenuTypes.cpp => MenuItemProperties.cpp}      |  6 +++---
 .../src/{MenuTypes.h => MenuItemProperties.h}          | 10 +++++-----
 libraries/script-engine/src/ScriptEngine.cpp           |  4 ++--
 5 files changed, 12 insertions(+), 13 deletions(-)
 rename libraries/script-engine/src/{MenuTypes.cpp => MenuItemProperties.cpp} (96%)
 rename libraries/script-engine/src/{MenuTypes.h => MenuItemProperties.h} (87%)

diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index f0dcb993e6..ffb2fdaf42 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -16,9 +16,8 @@
 
 #include <AbstractMenuInterface.h>
 #include <EventTypes.h>
-#include <MenuTypes.h>
+#include <MenuItemProperties.h>
 #include <OctreeConstants.h>
-//#include <VoxelConstants.h>
 
 const float ADJUST_LOD_DOWN_FPS = 40.0;
 const float ADJUST_LOD_UP_FPS = 55.0;
diff --git a/interface/src/MenuScriptingInterface.h b/interface/src/MenuScriptingInterface.h
index 837d7e3cf7..7379f2c00b 100644
--- a/interface/src/MenuScriptingInterface.h
+++ b/interface/src/MenuScriptingInterface.h
@@ -15,7 +15,7 @@
 #include <QString>
 
 #include "Menu.h"
-#include <MenuTypes.h>
+#include <MenuItemProperties.h>
 
 class MenuScriptingInterface : public QObject {
     Q_OBJECT
diff --git a/libraries/script-engine/src/MenuTypes.cpp b/libraries/script-engine/src/MenuItemProperties.cpp
similarity index 96%
rename from libraries/script-engine/src/MenuTypes.cpp
rename to libraries/script-engine/src/MenuItemProperties.cpp
index e467c9d23a..fc1e94f40c 100644
--- a/libraries/script-engine/src/MenuTypes.cpp
+++ b/libraries/script-engine/src/MenuItemProperties.cpp
@@ -1,5 +1,5 @@
 //
-//  MenuTypes.cpp
+//  MenuItemProperties.cpp
 //  hifi
 //
 //  Created by Brad Hefta-Gaub on 1/28/14.
@@ -10,7 +10,7 @@
 
 #include <QDebug>
 #include <RegisteredMetaTypes.h>
-#include "MenuTypes.h"
+#include "MenuItemProperties.h"
 
 MenuItemProperties::MenuItemProperties() :
     menuName(""),
@@ -56,7 +56,7 @@ MenuItemProperties::MenuItemProperties(const QString& menuName, const QString& m
 {
 }
 
-void registerMenuTypes(QScriptEngine* engine) {
+void registerMenuItemProperties(QScriptEngine* engine) {
     qScriptRegisterMetaType(engine, menuItemPropertiesToScriptValue, menuItemPropertiesFromScriptValue);
 }
 
diff --git a/libraries/script-engine/src/MenuTypes.h b/libraries/script-engine/src/MenuItemProperties.h
similarity index 87%
rename from libraries/script-engine/src/MenuTypes.h
rename to libraries/script-engine/src/MenuItemProperties.h
index ef92225288..6e0b3309b1 100644
--- a/libraries/script-engine/src/MenuTypes.h
+++ b/libraries/script-engine/src/MenuItemProperties.h
@@ -1,13 +1,13 @@
 //
-//  MenuTypes.h
+//  MenuItemProperties.h
 //  hifi
 //
 //  Created by Brad Hefta-Gaub on 1/28/14.
 //  Copyright (c) 2014 HighFidelity, Inc. All rights reserved.
 //
 
-#ifndef __hifi_MenuTypes_h__
-#define __hifi_MenuTypes_h__
+#ifndef __hifi_MenuItemProperties_h__
+#define __hifi_MenuItemProperties_h__
 
 #include <QtScript/QScriptEngine>
 
@@ -43,8 +43,8 @@ public:
 Q_DECLARE_METATYPE(MenuItemProperties)
 QScriptValue menuItemPropertiesToScriptValue(QScriptEngine* engine, const MenuItemProperties& props);
 void menuItemPropertiesFromScriptValue(const QScriptValue& object, MenuItemProperties& props);
-void registerMenuTypes(QScriptEngine* engine);
+void registerMenuItemProperties(QScriptEngine* engine);
 
 
 
-#endif // __hifi_MenuTypes_h__
+#endif // __hifi_MenuItemProperties_h__
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 2a70521a13..06818f5355 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -24,7 +24,7 @@
 
 #include <Sound.h>
 
-#include "MenuTypes.h"
+#include "MenuItemProperties.h"
 #include "ScriptEngine.h"
 
 const unsigned int VISUAL_DATA_CALLBACK_USECS = (1.0 / 60.0) * 1000 * 1000;
@@ -138,7 +138,7 @@ void ScriptEngine::init() {
     registerMetaTypes(&_engine);
     registerVoxelMetaTypes(&_engine);
     registerEventTypes(&_engine);
-    registerMenuTypes(&_engine);
+    registerMenuItemProperties(&_engine);
     
     qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);
     qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);