remove some unneeded Q_OBJECT macros, diff minimization

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

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

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();

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();