From 2dd75fef2c25b7de6ef2f3d506d139dd9eb097f1 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 17 Mar 2015 19:12:26 -0700
Subject: [PATCH] remove some unneeded Q_OBJECT macros, diff minimization

---
 libraries/entities/src/ModelEntityItem.h | 7 +++----
 libraries/physics/src/PhysicsEngine.cpp  | 1 -
 libraries/physics/src/PhysicsEngine.h    | 2 --
 libraries/shared/src/ShapeInfo.h         | 4 +---
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h
index 3bd414ec6e..081cb429ed 100644
--- a/libraries/entities/src/ModelEntityItem.h
+++ b/libraries/entities/src/ModelEntityItem.h
@@ -16,9 +16,6 @@
 
 #include "EntityItem.h" 
 
-class NetworkGeometry;
-class GeometryCache;
-
 class ModelEntityItem : public EntityItem {
 public:
     static EntityItem* factory(const EntityItemID& entityID, const EntityItemProperties& properties);
@@ -52,6 +49,7 @@ public:
     virtual void debugDump() const;
 
     void updateShapeType(ShapeType type);
+    virtual ShapeType getShapeType() const { return _shapeType; }
 
     // TODO: Move these to subclasses, or other appropriate abstraction
     // getters/setters applicable to models and particles
@@ -121,7 +119,7 @@ public:
     void setTextures(const QString& textures) { _textures = textures; }
     
     static void cleanupLoadedAnimations();
-
+    
 protected:
 
     bool isAnimatingSomething() const;
@@ -144,6 +142,7 @@ protected:
     static Animation* getAnimation(const QString& url);
     static QMap<QString, AnimationPointer> _loadedAnimations;
     static AnimationCache _animationCache;
+
 };
 
 #endif // hifi_ModelEntityItem_h
diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp
index d5dfe849de..c7b3d60e41 100644
--- a/libraries/physics/src/PhysicsEngine.cpp
+++ b/libraries/physics/src/PhysicsEngine.cpp
@@ -284,7 +284,6 @@ void PhysicsEngine::stepSimulation() {
     assert(_avatarData);
 
     lock();
-
     // NOTE: the grand order of operations is:
     // (1) relay incoming changes
     // (2) step simulation
diff --git a/libraries/physics/src/PhysicsEngine.h b/libraries/physics/src/PhysicsEngine.h
index 0cd9513be0..acf1617b16 100644
--- a/libraries/physics/src/PhysicsEngine.h
+++ b/libraries/physics/src/PhysicsEngine.h
@@ -49,8 +49,6 @@ typedef std::map<ContactKey, ContactInfo> ContactMap;
 typedef std::pair<ContactKey, ContactInfo> ContactMapElement;
 
 class PhysicsEngine : public EntitySimulation {
-    Q_OBJECT
-
 public:
     // TODO: find a good way to make this a non-static method
     static uint32_t getNumSubsteps();
diff --git a/libraries/shared/src/ShapeInfo.h b/libraries/shared/src/ShapeInfo.h
index 75efc97ca2..ff0b5ca8ff 100644
--- a/libraries/shared/src/ShapeInfo.h
+++ b/libraries/shared/src/ShapeInfo.h
@@ -12,7 +12,6 @@
 #ifndef hifi_ShapeInfo_h
 #define hifi_ShapeInfo_h
 
-#include <QObject>
 #include <QVector>
 #include <QString>
 #include <QUrl>
@@ -36,8 +35,7 @@ enum ShapeType {
     SHAPE_TYPE_CYLINDER_Z
 };
 
-class ShapeInfo : QObject {
-    Q_OBJECT
+class ShapeInfo {
 
 public:
     void clear();