From 4ec70041ccbf210be2dfd96c92311ee7df39d65f Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 28 Oct 2014 15:20:02 -0700 Subject: [PATCH 1/2] fix memory leak --- libraries/entities/src/EntityItemProperties.cpp | 5 ++++- libraries/entities/src/EntityItemProperties.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index c05fe5417d..5accda2062 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -102,11 +102,14 @@ EntityItemProperties::EntityItemProperties() : _sittingPoints(NULL), _naturalDimensions(1.0f, 1.0f, 1.0f) { +} + +EntityItemProperties::~EntityItemProperties() { if (_sittingPoints) { delete _sittingPoints; _sittingPoints = NULL; } -} +}; void EntityItemProperties::setSittingPoints(const QVector& sittingPoints) { if (!_sittingPoints) { diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h index 5fef2151b2..f977b346cc 100644 --- a/libraries/entities/src/EntityItemProperties.h +++ b/libraries/entities/src/EntityItemProperties.h @@ -96,7 +96,7 @@ class EntityItemProperties { friend class LightEntityItem; // TODO: consider removing this friend relationship and use public methods public: EntityItemProperties(); - virtual ~EntityItemProperties() { }; + virtual ~EntityItemProperties(); virtual QScriptValue copyToScriptValue(QScriptEngine* engine) const; virtual void copyFromScriptValue(const QScriptValue& object); From 47ba32e95eb7b68dc5aff49dbb5c9c39e064a992 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 28 Oct 2014 15:27:56 -0700 Subject: [PATCH 2/2] feedback --- libraries/entities/src/EntityItemProperties.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 5accda2062..83d13e369d 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -109,7 +109,7 @@ EntityItemProperties::~EntityItemProperties() { delete _sittingPoints; _sittingPoints = NULL; } -}; +} void EntityItemProperties::setSittingPoints(const QVector& sittingPoints) { if (!_sittingPoints) {