From 3e71c4cc4e9f15bc80955fea7f239ce9255de6fb Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 9 Oct 2015 13:18:05 -0700
Subject: [PATCH] CR

---
 libraries/entities/src/AnimationPropertyGroup.h  | 2 --
 libraries/entities/src/AtmospherePropertyGroup.h | 3 ---
 libraries/entities/src/PropertyGroup.h           | 3 +--
 libraries/entities/src/SkyboxPropertyGroup.h     | 3 ---
 libraries/entities/src/StagePropertyGroup.h      | 3 ---
 tests/entities/src/main.cpp                      | 3 ++-
 6 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/libraries/entities/src/AnimationPropertyGroup.h b/libraries/entities/src/AnimationPropertyGroup.h
index 848632b13e..d0d218f4b3 100644
--- a/libraries/entities/src/AnimationPropertyGroup.h
+++ b/libraries/entities/src/AnimationPropertyGroup.h
@@ -31,8 +31,6 @@ class ReadBitstreamToTreeParams;
 
 class AnimationPropertyGroup : public PropertyGroup {
 public:
-    AnimationPropertyGroup() = default;
-    virtual ~AnimationPropertyGroup() = default;
     void associateWithAnimationLoop(AnimationLoop* animationLoop) { _animationLoop = animationLoop; }
 
     // EntityItemProperty related helpers
diff --git a/libraries/entities/src/AtmospherePropertyGroup.h b/libraries/entities/src/AtmospherePropertyGroup.h
index b4ec1a96e2..661d91087b 100644
--- a/libraries/entities/src/AtmospherePropertyGroup.h
+++ b/libraries/entities/src/AtmospherePropertyGroup.h
@@ -49,9 +49,6 @@ class ReadBitstreamToTreeParams;
 
 class AtmospherePropertyGroup : public PropertyGroup {
 public:
-    AtmospherePropertyGroup() = default;
-    virtual ~AtmospherePropertyGroup() = default;
-
     // EntityItemProperty related helpers
     virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const;
     virtual void copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings);
diff --git a/libraries/entities/src/PropertyGroup.h b/libraries/entities/src/PropertyGroup.h
index ea73f8656a..27d35fa714 100644
--- a/libraries/entities/src/PropertyGroup.h
+++ b/libraries/entities/src/PropertyGroup.h
@@ -51,8 +51,7 @@ class ReadBitstreamToTreeParams;
 
 class PropertyGroup {
 public:
-    PropertyGroup() {}
-    virtual ~PropertyGroup() {}
+    virtual ~PropertyGroup() = default;
 
     // EntityItemProperty related helpers
     virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const = 0;
diff --git a/libraries/entities/src/SkyboxPropertyGroup.h b/libraries/entities/src/SkyboxPropertyGroup.h
index 9e0b77cc03..2ebfcfda14 100644
--- a/libraries/entities/src/SkyboxPropertyGroup.h
+++ b/libraries/entities/src/SkyboxPropertyGroup.h
@@ -29,9 +29,6 @@ class ReadBitstreamToTreeParams;
 
 class SkyboxPropertyGroup : public PropertyGroup {
 public:
-    SkyboxPropertyGroup() = default;
-    virtual ~SkyboxPropertyGroup() = default;
-
     // EntityItemProperty related helpers
     virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const;
     virtual void copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings);
diff --git a/libraries/entities/src/StagePropertyGroup.h b/libraries/entities/src/StagePropertyGroup.h
index b8a8b5b6d2..95964f8264 100644
--- a/libraries/entities/src/StagePropertyGroup.h
+++ b/libraries/entities/src/StagePropertyGroup.h
@@ -29,9 +29,6 @@ class ReadBitstreamToTreeParams;
 
 class StagePropertyGroup : public PropertyGroup {
 public:
-    StagePropertyGroup() = default;
-    virtual ~StagePropertyGroup() = default;
-
     // EntityItemProperty related helpers
     virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const;
     virtual void copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings);
diff --git a/tests/entities/src/main.cpp b/tests/entities/src/main.cpp
index 1b150ee3f5..0cbd354e92 100644
--- a/tests/entities/src/main.cpp
+++ b/tests/entities/src/main.cpp
@@ -16,9 +16,10 @@
 #include <QDir>
 #include <ByteCountCoding.h>
 
-#include <PathUtils.h>
 #include <BoxEntityItem.h>
+#include <EntityItemProperties.h>
 #include <Octree.h>
+#include <PathUtils.h>
 
 const QString& getTestResourceDir() {
     static QString dir;