From 9ceec414326824db0d4598224131a5d4acd4db83 Mon Sep 17 00:00:00 2001
From: badlogic <badlogicgames@gmail.com>
Date: Mon, 5 Mar 2018 14:32:09 +0100
Subject: [PATCH] [cpp] Removed toString, fixed up remaining memory leaks in
 clipping and animation state code.

---
 spine-cpp/spine-cpp/include/spine/Animation.h |  2 +-
 .../spine-cpp/include/spine/AnimationState.h  |  8 ++---
 .../include/spine/AnimationStateData.h        |  4 +--
 spine-cpp/spine-cpp/include/spine/Atlas.h     | 17 +---------
 .../include/spine/AtlasAttachmentLoader.h     |  2 +-
 spine-cpp/spine-cpp/include/spine/Bone.h      |  2 +-
 spine-cpp/spine-cpp/include/spine/BoneData.h  |  2 +-
 .../include/spine/BoundingBoxAttachment.h     |  2 +-
 .../include/spine/ClippingAttachment.h        |  2 +-
 spine-cpp/spine-cpp/include/spine/Color.h     |  7 ----
 spine-cpp/spine-cpp/include/spine/Debug.h     |  3 ++
 spine-cpp/spine-cpp/include/spine/Event.h     |  2 +-
 spine-cpp/spine-cpp/include/spine/EventData.h |  2 +-
 spine-cpp/spine-cpp/include/spine/HashMap.h   | 22 -------------
 .../spine-cpp/include/spine/IkConstraint.h    |  2 +-
 .../include/spine/IkConstraintData.h          |  2 +-
 spine-cpp/spine-cpp/include/spine/Json.h      |  2 +-
 .../spine-cpp/include/spine/LinkedMesh.h      |  2 +-
 .../spine-cpp/include/spine/MeshAttachment.h  |  2 +-
 .../spine-cpp/include/spine/PathAttachment.h  |  2 +-
 .../spine-cpp/include/spine/PathConstraint.h  |  2 +-
 .../include/spine/PathConstraintData.h        |  2 +-
 .../spine-cpp/include/spine/PointAttachment.h |  2 +-
 spine-cpp/spine-cpp/include/spine/Pool.h      |  6 ----
 spine-cpp/spine-cpp/include/spine/RTTI.h      |  2 +-
 .../include/spine/RegionAttachment.h          |  2 +-
 spine-cpp/spine-cpp/include/spine/Skeleton.h  |  2 +-
 .../spine-cpp/include/spine/SkeletonBinary.h  |  4 +--
 .../spine-cpp/include/spine/SkeletonBounds.h  |  4 +--
 .../include/spine/SkeletonClipping.h          |  4 +--
 .../spine-cpp/include/spine/SkeletonData.h    |  2 +-
 .../spine-cpp/include/spine/SkeletonJson.h    |  2 +-
 spine-cpp/spine-cpp/include/spine/Skin.h      |  4 +--
 spine-cpp/spine-cpp/include/spine/Slot.h      |  2 +-
 spine-cpp/spine-cpp/include/spine/SlotData.h  |  2 +-
 .../spine-cpp/include/spine/SpineObject.h     |  2 --
 spine-cpp/spine-cpp/include/spine/String.h    | 16 +--------
 spine-cpp/spine-cpp/include/spine/Timeline.h  |  2 --
 .../include/spine/TransformConstraint.h       |  2 +-
 .../include/spine/TransformConstraintData.h   |  2 +-
 .../spine-cpp/include/spine/Triangulator.h    | 20 +++++------
 spine-cpp/spine-cpp/include/spine/Vector.h    | 12 -------
 spine-cpp/spine-cpp/include/spine/Vertices.h  |  4 ---
 spine-cpp/spine-cpp/src/spine/Animation.cpp   |  8 -----
 .../spine-cpp/src/spine/AnimationState.cpp    | 33 ++++++++++---------
 .../src/spine/AnimationStateData.cpp          | 10 ------
 spine-cpp/spine-cpp/src/spine/Atlas.cpp       |  3 --
 .../src/spine/AtlasAttachmentLoader.cpp       |  3 --
 spine-cpp/spine-cpp/src/spine/Bone.cpp        |  7 ----
 spine-cpp/spine-cpp/src/spine/BoneData.cpp    |  3 --
 .../src/spine/BoundingBoxAttachment.cpp       |  8 -----
 .../src/spine/ClippingAttachment.cpp          |  8 -----
 spine-cpp/spine-cpp/src/spine/Event.cpp       |  3 --
 spine-cpp/spine-cpp/src/spine/EventData.cpp   |  3 --
 .../spine-cpp/src/spine/IkConstraint.cpp      |  6 ----
 .../spine-cpp/src/spine/IkConstraintData.cpp  |  3 --
 spine-cpp/spine-cpp/src/spine/Json.cpp        |  3 --
 spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp  |  3 --
 .../spine-cpp/src/spine/MeshAttachment.cpp    |  5 ---
 .../spine-cpp/src/spine/PathAttachment.cpp    |  8 -----
 .../spine-cpp/src/spine/PathConstraint.cpp    |  5 ---
 .../src/spine/PathConstraintData.cpp          |  5 ---
 .../spine-cpp/src/spine/PointAttachment.cpp   |  5 ---
 spine-cpp/spine-cpp/src/spine/RTTI.cpp        |  5 ---
 .../spine-cpp/src/spine/RegionAttachment.cpp  |  6 ----
 spine-cpp/spine-cpp/src/spine/Skeleton.cpp    | 12 -------
 .../spine-cpp/src/spine/SkeletonBinary.cpp    |  4 ---
 .../spine-cpp/src/spine/SkeletonBounds.cpp    |  9 -----
 .../spine-cpp/src/spine/SkeletonClipping.cpp  | 21 +++++-------
 .../spine-cpp/src/spine/SkeletonData.cpp      |  4 ---
 .../spine-cpp/src/spine/SkeletonJson.cpp      |  4 ---
 spine-cpp/spine-cpp/src/spine/Skin.cpp        | 14 --------
 spine-cpp/spine-cpp/src/spine/Slot.cpp        |  8 -----
 spine-cpp/spine-cpp/src/spine/SlotData.cpp    |  3 --
 spine-cpp/spine-cpp/src/spine/Timeline.cpp    |  5 ---
 .../src/spine/TransformConstraint.cpp         |  6 ----
 .../src/spine/TransformConstraintData.cpp     |  3 --
 .../spine-cpp/src/spine/Triangulator.cpp      | 13 +++++---
 spine-sfml/cpp/example/main.cpp               | 17 +++++++---
 79 files changed, 98 insertions(+), 359 deletions(-)

diff --git a/spine-cpp/spine-cpp/include/spine/Animation.h b/spine-cpp/spine-cpp/include/spine/Animation.h
index 76220e16b..a6d5ef711 100644
--- a/spine-cpp/spine-cpp/include/spine/Animation.h
+++ b/spine-cpp/spine-cpp/include/spine/Animation.h
@@ -101,7 +101,7 @@ public:
 
 	void setDuration(float inValue);
 
-	String toString() const;
+
 
 private:
 	Vector<Timeline *> _timelines;
diff --git a/spine-cpp/spine-cpp/include/spine/AnimationState.h b/spine-cpp/spine-cpp/include/spine/AnimationState.h
index 55592a575..bd6fcf2e8 100644
--- a/spine-cpp/spine-cpp/include/spine/AnimationState.h
+++ b/spine-cpp/spine-cpp/include/spine/AnimationState.h
@@ -214,7 +214,7 @@ namespace Spine {
         
         void setOnAnimationEventFunc(OnAnimationEventFunc inValue);
 
-        String toString() const;
+
     private:
         Animation* _animation;
         
@@ -251,7 +251,7 @@ namespace Spine {
         
         EventQueueEntry(EventType eventType, TrackEntry* trackEntry, Event* event = NULL);
 
-		String toString() const;
+
     };
     
     class EventQueue : public SpineObject {
@@ -285,8 +285,6 @@ namespace Spine {
 
         /// Raises all events in the queue and drains the queue.
         void drain();
-
-		String toString() const ;
     };
     
     class AnimationState : public SpineObject {
@@ -379,7 +377,7 @@ namespace Spine {
         void setRendererObject(void* inValue);
         void* getRendererObject();
 
-        String toString() const;
+
         
     private:
         static const int Subsequent, First, Dip, DipMix;
diff --git a/spine-cpp/spine-cpp/include/spine/AnimationStateData.h b/spine-cpp/spine-cpp/include/spine/AnimationStateData.h
index 34920274a..94b650d92 100644
--- a/spine-cpp/spine-cpp/include/spine/AnimationStateData.h
+++ b/spine-cpp/spine-cpp/include/spine/AnimationStateData.h
@@ -68,7 +68,7 @@ namespace Spine {
         ///
         float getMix(Animation* from, Animation* to);
 
-        String toString() const;
+
 
     private:
         class AnimationPair : public SpineObject {
@@ -80,7 +80,7 @@ namespace Spine {
             
             bool operator==(const AnimationPair &other) const;
 
-            String toString() const;
+
         };
         
         struct HashAnimationPair : public SpineObject {
diff --git a/spine-cpp/spine-cpp/include/spine/Atlas.h b/spine-cpp/spine-cpp/include/spine/Atlas.h
index 6278150c4..74949a74f 100644
--- a/spine-cpp/spine-cpp/include/spine/Atlas.h
+++ b/spine-cpp/spine-cpp/include/spine/Atlas.h
@@ -78,15 +78,6 @@ public:
 											   magFilter(TextureFilter_Nearest), uWrap(TextureWrap_ClampToEdge),
 											   vWrap(TextureWrap_ClampToEdge) {
 	}
-
-	String toString() const {
-		String str;
-		str.append("AtlasPage { name: ").appendString(name)
-				.append(", width: ").append(width)
-				.append(", height: ").append(height)
-				.append(" }");
-		return str;
-	}
 };
 
 class AtlasRegion : public SpineObject {
@@ -101,12 +92,6 @@ public:
 	bool rotate;
 	Vector<int> splits;
 	Vector<int> pads;
-
-	String toString() const {
-		String str;
-		str.append("AtlasRegion { name: ").appendString(name).append(" }");
-		return str;
-	}
 };
 
 class TextureLoader;
@@ -128,7 +113,7 @@ public:
 
 	void dispose();
 
-	String toString() const;
+
 
 private:
 	Vector<AtlasPage *> _pages;
diff --git a/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h b/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h
index 1662262f0..028589879 100644
--- a/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h
+++ b/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h
@@ -64,7 +64,7 @@ namespace Spine {
         
         AtlasRegion* findRegion(const String& name);
 
-        String toString() const;
+
         
     private:
         Atlas* _atlas;
diff --git a/spine-cpp/spine-cpp/include/spine/Bone.h b/spine-cpp/spine-cpp/include/spine/Bone.h
index 6273d84f9..65eddbb26 100644
--- a/spine-cpp/spine-cpp/include/spine/Bone.h
+++ b/spine-cpp/spine-cpp/include/spine/Bone.h
@@ -221,7 +221,7 @@ public:
 	/// Returns the magnitide (always positive) of the world scale Y.
 	float getWorldScaleY();
 
-	String toString() const;
+
 
 private:
 	static bool yDown;
diff --git a/spine-cpp/spine-cpp/include/spine/BoneData.h b/spine-cpp/spine-cpp/include/spine/BoneData.h
index a2276ea6e..47b2457c2 100644
--- a/spine-cpp/spine-cpp/include/spine/BoneData.h
+++ b/spine-cpp/spine-cpp/include/spine/BoneData.h
@@ -107,7 +107,7 @@ public:
 
 	void setTransformMode(TransformMode inValue);
 
-	String toString() const;
+
 
 private:
 	const int _index;
diff --git a/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h b/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h
index e20a4dd93..f5b8b2229 100644
--- a/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h
@@ -41,7 +41,7 @@ namespace Spine {
         
         explicit BoundingBoxAttachment(const String& name);
 
-        String toString() const;
+
     };
 }
 
diff --git a/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h b/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h
index 8180b12c4..5a2fdcc5b 100644
--- a/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h
@@ -50,7 +50,7 @@ namespace Spine {
         SlotData* getEndSlot();
         void setEndSlot(SlotData* inValue);
 
-        String toString() const;
+
         
     private:
         SlotData* _endSlot;
diff --git a/spine-cpp/spine-cpp/include/spine/Color.h b/spine-cpp/spine-cpp/include/spine/Color.h
index 5d6b4441d..e97ed6f18 100644
--- a/spine-cpp/spine-cpp/include/spine/Color.h
+++ b/spine-cpp/spine-cpp/include/spine/Color.h
@@ -87,13 +87,6 @@ public:
 	}
 
 	float _r, _g, _b, _a;
-
-	inline String toString() const {
-		String str;
-		str.append("Color { r: ").append(_r).append(", g: ").append(_g).append(", b: ").append(_b).append(
-				", a: ").append(_a).append(" }");
-		return str;
-	}
 };
 }
 
diff --git a/spine-cpp/spine-cpp/include/spine/Debug.h b/spine-cpp/spine-cpp/include/spine/Debug.h
index 307f759e0..a444a40c7 100644
--- a/spine-cpp/spine-cpp/include/spine/Debug.h
+++ b/spine-cpp/spine-cpp/include/spine/Debug.h
@@ -51,6 +51,9 @@ class DebugExtension : public DefaultSpineExtension {
 	};
 
 public:
+	DebugExtension(): _allocations(0), _reallocations(0), _frees(0) {
+	}
+
 	void reportLeaks() {
 		for (std::vector<Allocation>::iterator it = _allocated.begin(); it != _allocated.end(); it++) {
 			printf("\"%s:%i (%zu bytes at %p)\n", it->fileName, it->line, it->size, it->address);
diff --git a/spine-cpp/spine-cpp/include/spine/Event.h b/spine-cpp/spine-cpp/include/spine/Event.h
index 2aaf98d8b..ec304a8ba 100644
--- a/spine-cpp/spine-cpp/include/spine/Event.h
+++ b/spine-cpp/spine-cpp/include/spine/Event.h
@@ -65,7 +65,7 @@ public:
 
 	void setStringValue(const String &inValue);
 
-	String toString() const;
+
 
 private:
 	const EventData &_data;
diff --git a/spine-cpp/spine-cpp/include/spine/EventData.h b/spine-cpp/spine-cpp/include/spine/EventData.h
index 199031b1e..fb442c384 100644
--- a/spine-cpp/spine-cpp/include/spine/EventData.h
+++ b/spine-cpp/spine-cpp/include/spine/EventData.h
@@ -61,7 +61,7 @@ public:
 
 	void setStringValue(const String &inValue);
 
-	String toString() const;
+
 
 private:
 	const String _name;
diff --git a/spine-cpp/spine-cpp/include/spine/HashMap.h b/spine-cpp/spine-cpp/include/spine/HashMap.h
index 09e154004..aacddff92 100755
--- a/spine-cpp/spine-cpp/include/spine/HashMap.h
+++ b/spine-cpp/spine-cpp/include/spine/HashMap.h
@@ -150,22 +150,6 @@ public:
 		return Entries(_head);
 	}
 
-	String toString() const {
-		String str;
-
-		str.append("{");
-		Entries entries = getEntries();
-
-		while (entries.hasNext()) {
-			Pair pair = entries.next();
-			str.append(pair.key);
-			str.append("->");
-			str.append(pair.value);
-		}
-		str.append("}");
-		return str;
-	}
-
 private:
 	Entry *find(const K &key) {
 		for (Entry *entry = _head; entry != NULL; entry = entry->next) {
@@ -183,12 +167,6 @@ private:
 		Entry *prev;
 
 		Entry() : next(NULL), prev(NULL) {}
-
-		String toString() const {
-			String str;
-			str.append("Entry { key: ").append(_key).append(" -> ").append(_value);
-			return str;
-		}
 	};
 
 	Entry *_head;
diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraint.h b/spine-cpp/spine-cpp/include/spine/IkConstraint.h
index 89a895865..223946a1b 100644
--- a/spine-cpp/spine-cpp/include/spine/IkConstraint.h
+++ b/spine-cpp/spine-cpp/include/spine/IkConstraint.h
@@ -84,7 +84,7 @@ public:
 
 	void setMix(float inValue);
 
-	String toString() const;
+
 
 private:
 	IkConstraintData &_data;
diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraintData.h b/spine-cpp/spine-cpp/include/spine/IkConstraintData.h
index 274f39633..18f72eb62 100644
--- a/spine-cpp/spine-cpp/include/spine/IkConstraintData.h
+++ b/spine-cpp/spine-cpp/include/spine/IkConstraintData.h
@@ -68,7 +68,7 @@ namespace Spine {
         float getMix();
         void setMix(float inValue);
 
-        String toString() const;
+
 
     private:
         const String _name;
diff --git a/spine-cpp/spine-cpp/include/spine/Json.h b/spine-cpp/spine-cpp/include/spine/Json.h
index ec32ff6ac..b67b2e51f 100644
--- a/spine-cpp/spine-cpp/include/spine/Json.h
+++ b/spine-cpp/spine-cpp/include/spine/Json.h
@@ -69,7 +69,7 @@ public:
 
 	~Json();
 
-	String toString() const;
+
 
 private:
 	static const char *_error;
diff --git a/spine-cpp/spine-cpp/include/spine/LinkedMesh.h b/spine-cpp/spine-cpp/include/spine/LinkedMesh.h
index eaad02e72..f74e8f96f 100644
--- a/spine-cpp/spine-cpp/include/spine/LinkedMesh.h
+++ b/spine-cpp/spine-cpp/include/spine/LinkedMesh.h
@@ -45,7 +45,7 @@ class LinkedMesh : public SpineObject {
 public:
 	LinkedMesh(MeshAttachment *mesh, const String &skin, int slotIndex, const String &parent);
 
-	String toString() const;
+
 
 private:
 	MeshAttachment *_mesh;
diff --git a/spine-cpp/spine-cpp/include/spine/MeshAttachment.h b/spine-cpp/spine-cpp/include/spine/MeshAttachment.h
index b434122b2..ec0090b68 100644
--- a/spine-cpp/spine-cpp/include/spine/MeshAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/MeshAttachment.h
@@ -122,7 +122,7 @@ namespace Spine {
         float getHeight();
         void setHeight(float inValue);
 
-        String toString() const;
+
 
     private:
         float _regionOffsetX, _regionOffsetY, _regionWidth, _regionHeight, _regionOriginalWidth, _regionOriginalHeight;
diff --git a/spine-cpp/spine-cpp/include/spine/PathAttachment.h b/spine-cpp/spine-cpp/include/spine/PathAttachment.h
index 3c8a5e949..ad3771b89 100644
--- a/spine-cpp/spine-cpp/include/spine/PathAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/PathAttachment.h
@@ -51,7 +51,7 @@ namespace Spine {
         bool isConstantSpeed();
         void setConstantSpeed(bool inValue);
 
-        String toString() const;
+
         
     private:
         Vector<float> _lengths;
diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraint.h b/spine-cpp/spine-cpp/include/spine/PathConstraint.h
index 80bdc0622..5ec215c08 100644
--- a/spine-cpp/spine-cpp/include/spine/PathConstraint.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraint.h
@@ -79,7 +79,7 @@ namespace Spine {
         
         PathConstraintData& getData();
 
-        String toString() const;
+
         
     private:
         static const float EPSILON;
diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintData.h b/spine-cpp/spine-cpp/include/spine/PathConstraintData.h
index 7cba60758..3067c2043 100644
--- a/spine-cpp/spine-cpp/include/spine/PathConstraintData.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraintData.h
@@ -89,7 +89,7 @@ namespace Spine {
         float getTranslateMix();
         void setTranslateMix(float inValue);
 
-        String toString() const;
+
     private:
         const String _name;
         int _order;
diff --git a/spine-cpp/spine-cpp/include/spine/PointAttachment.h b/spine-cpp/spine-cpp/include/spine/PointAttachment.h
index 7768da3d5..b3383f342 100644
--- a/spine-cpp/spine-cpp/include/spine/PointAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/PointAttachment.h
@@ -65,7 +65,7 @@ namespace Spine {
         float getRotation();
         void setRotation(float inValue);
 
-        String toString() const;
+
         
     private:
         float _x, _y, _rotation;
diff --git a/spine-cpp/spine-cpp/include/spine/Pool.h b/spine-cpp/spine-cpp/include/spine/Pool.h
index 3537a7497..946b6f7bc 100644
--- a/spine-cpp/spine-cpp/include/spine/Pool.h
+++ b/spine-cpp/spine-cpp/include/spine/Pool.h
@@ -67,12 +67,6 @@ public:
 		}
 	}
 
-	String toString() const {
-		String str;
-		str.append("Pool { size: ").append((int) _objects.size()).append(" }");
-		return str;
-	}
-
 private:
 	Vector<T *> _objects;
 };
diff --git a/spine-cpp/spine-cpp/include/spine/RTTI.h b/spine-cpp/spine-cpp/include/spine/RTTI.h
index 038263efb..71d4e06c1 100644
--- a/spine-cpp/spine-cpp/include/spine/RTTI.h
+++ b/spine-cpp/spine-cpp/include/spine/RTTI.h
@@ -48,7 +48,7 @@ public:
 
 	bool instanceOf(const RTTI &rtti) const;
 
-	String toString() const;
+
 
 private:
 	// Prevent copying
diff --git a/spine-cpp/spine-cpp/include/spine/RegionAttachment.h b/spine-cpp/spine-cpp/include/spine/RegionAttachment.h
index 613b35cc8..e408756d7 100644
--- a/spine-cpp/spine-cpp/include/spine/RegionAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/RegionAttachment.h
@@ -107,7 +107,7 @@ namespace Spine {
         Vector<float>& getOffset();
         Vector<float>& getUVs();
 
-        String toString() const;
+
         
     private:
         static const int BLX;
diff --git a/spine-cpp/spine-cpp/include/spine/Skeleton.h b/spine-cpp/spine-cpp/include/spine/Skeleton.h
index 61d15f92e..a62da2124 100644
--- a/spine-cpp/spine-cpp/include/spine/Skeleton.h
+++ b/spine-cpp/spine-cpp/include/spine/Skeleton.h
@@ -212,7 +212,7 @@ public:
 
 	void setFlipY(bool inValue);
 
-	String toString() const;
+
 
 private:
 	SkeletonData *_data;
diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonBinary.h b/spine-cpp/spine-cpp/include/spine/SkeletonBinary.h
index 0750628fc..340ba2406 100644
--- a/spine-cpp/spine-cpp/include/spine/SkeletonBinary.h
+++ b/spine-cpp/spine-cpp/include/spine/SkeletonBinary.h
@@ -81,14 +81,12 @@ namespace Spine {
 
         String& getError() { return _error; }
 
-        String toString() const;
+
         
     private:
         struct DataInput : public SpineObject {
             const unsigned char* cursor;
             const unsigned char* end;
-
-            String toString() const { return String("DataInput"); }
         };
         
         AttachmentLoader* _attachmentLoader;
diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonBounds.h b/spine-cpp/spine-cpp/include/spine/SkeletonBounds.h
index b14cee508..2f78488d7 100644
--- a/spine-cpp/spine-cpp/include/spine/SkeletonBounds.h
+++ b/spine-cpp/spine-cpp/include/spine/SkeletonBounds.h
@@ -86,7 +86,7 @@ namespace Spine {
         float getWidth();
         float getHeight();
 
-        String toString() const;
+
         
     private:
         Vector<Polygon*> _polygonPool;
@@ -106,7 +106,7 @@ namespace Spine {
 			_vertices.ensureCapacity(16);
         }
 
-        String toString() const;
+
     };
 }
 
diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonClipping.h b/spine-cpp/spine-cpp/include/spine/SkeletonClipping.h
index 41a6b8645..7ea44d94e 100644
--- a/spine-cpp/spine-cpp/include/spine/SkeletonClipping.h
+++ b/spine-cpp/spine-cpp/include/spine/SkeletonClipping.h
@@ -56,7 +56,7 @@ namespace Spine {
         Vector<unsigned short>& getClippedTriangles();
         Vector<float>& getClippedUVs();
 
-        String toString() const;
+
         
     private:
         Triangulator _triangulator;
@@ -67,7 +67,7 @@ namespace Spine {
         Vector<float> _clippedUVs;
         Vector<float> _scratch;
         ClippingAttachment* _clipAttachment;
-        Vector< Vector<float>* > _clippingPolygons;
+        Vector< Vector<float>* > *_clippingPolygons;
         
         /** Clips the input triangle against the convex, clockwise clipping area. If the triangle lies entirely within the clipping
                   * area, false is returned. The clipping area must duplicate the first vertex at the end of the vertices list. */
diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonData.h b/spine-cpp/spine-cpp/include/spine/SkeletonData.h
index b018e617a..ad6bd172b 100644
--- a/spine-cpp/spine-cpp/include/spine/SkeletonData.h
+++ b/spine-cpp/spine-cpp/include/spine/SkeletonData.h
@@ -167,7 +167,7 @@ public:
 
 	void setFps(float inValue);
 
-	String toString() const;
+
 
 private:
 	String _name;
diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonJson.h b/spine-cpp/spine-cpp/include/spine/SkeletonJson.h
index a9ebf3918..a3209f79f 100644
--- a/spine-cpp/spine-cpp/include/spine/SkeletonJson.h
+++ b/spine-cpp/spine-cpp/include/spine/SkeletonJson.h
@@ -70,7 +70,7 @@ public:
 
 	String &getError() { return _error; }
 
-	String toString() const;
+
 
 private:
 	AttachmentLoader *_attachmentLoader;
diff --git a/spine-cpp/spine-cpp/include/spine/Skin.h b/spine-cpp/spine-cpp/include/spine/Skin.h
index 2c92f4efe..0440a2c20 100644
--- a/spine-cpp/spine-cpp/include/spine/Skin.h
+++ b/spine-cpp/spine-cpp/include/spine/Skin.h
@@ -61,7 +61,7 @@ public:
 
 		bool operator==(const AttachmentKey &other) const;
 
-		String toString() const;
+
 	};
 
 	struct HashAttachmentKey : public SpineObject {
@@ -93,7 +93,7 @@ public:
 
 	HashMap<AttachmentKey, Attachment *> &getAttachments();
 
-	String toString() const;
+
 
 private:
 	const String _name;
diff --git a/spine-cpp/spine-cpp/include/spine/Slot.h b/spine-cpp/spine-cpp/include/spine/Slot.h
index 5fbb39eec..75b6c8c7f 100644
--- a/spine-cpp/spine-cpp/include/spine/Slot.h
+++ b/spine-cpp/spine-cpp/include/spine/Slot.h
@@ -115,7 +115,7 @@ public:
 
 	void setAttachmentVertices(Vector<float> &inValue);
 
-	String toString() const;
+
 
 private:
 	SlotData &_data;
diff --git a/spine-cpp/spine-cpp/include/spine/SlotData.h b/spine-cpp/spine-cpp/include/spine/SlotData.h
index 7160c6bd4..b8a745e36 100644
--- a/spine-cpp/spine-cpp/include/spine/SlotData.h
+++ b/spine-cpp/spine-cpp/include/spine/SlotData.h
@@ -98,7 +98,7 @@ public:
 
 	void setBlendMode(BlendMode inValue);
 
-	String toString() const;
+
 
 private:
 	const int _index;
diff --git a/spine-cpp/spine-cpp/include/spine/SpineObject.h b/spine-cpp/spine-cpp/include/spine/SpineObject.h
index ee8745acf..c01aa7811 100644
--- a/spine-cpp/spine-cpp/include/spine/SpineObject.h
+++ b/spine-cpp/spine-cpp/include/spine/SpineObject.h
@@ -45,8 +45,6 @@ public:
 	void operator delete(void *p);
 
 	virtual ~SpineObject();
-
-	virtual String toString() const = 0;
 };
 }
 
diff --git a/spine-cpp/spine-cpp/include/spine/String.h b/spine-cpp/spine-cpp/include/spine/String.h
index 89b492ac2..fda962329 100644
--- a/spine-cpp/spine-cpp/include/spine/String.h
+++ b/spine-cpp/spine-cpp/include/spine/String.h
@@ -149,7 +149,7 @@ public:
 		return *this;
 	}
 
-	String &appendString(const String &other) {
+	String &append(const String &other) {
 		size_t len = other.length();
 		size_t thisLen = _length;
 		_length = _length + len;
@@ -173,16 +173,6 @@ public:
 		return *this;
 	}
 
-	String &append(const SpineObject &object) {
-		appendString(object.toString());
-		return *this;
-	}
-
-	String &append(const SpineObject *object) {
-		appendString(object->toString());
-		return *this;
-	}
-
 	friend bool operator==(const String &a, const String &b) {
 		if (a._buffer == b._buffer) return true;
 		if (a._length != b._length) return false;
@@ -203,10 +193,6 @@ public:
 		}
 	}
 
-	String toString() const {
-		return *this;
-	}
-
 private:
 	mutable size_t _length;
 	mutable char *_buffer;
diff --git a/spine-cpp/spine-cpp/include/spine/Timeline.h b/spine-cpp/spine-cpp/include/spine/Timeline.h
index ed1fdf1e0..be7e08857 100644
--- a/spine-cpp/spine-cpp/include/spine/Timeline.h
+++ b/spine-cpp/spine-cpp/include/spine/Timeline.h
@@ -66,8 +66,6 @@ public:
 		  MixDirection direction) = 0;
 
 	virtual int getPropertyId() = 0;
-
-	virtual String toString() const;
 };
 }
 
diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraint.h b/spine-cpp/spine-cpp/include/spine/TransformConstraint.h
index b52c8b076..4569a5645 100644
--- a/spine-cpp/spine-cpp/include/spine/TransformConstraint.h
+++ b/spine-cpp/spine-cpp/include/spine/TransformConstraint.h
@@ -74,7 +74,7 @@ namespace Spine {
         float getShearMix();
         void setShearMix(float inValue);
 
-        String toString() const;
+
         
     private:
         TransformConstraintData& _data;
diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraintData.h b/spine-cpp/spine-cpp/include/spine/TransformConstraintData.h
index 6a264b0d6..d292462fc 100644
--- a/spine-cpp/spine-cpp/include/spine/TransformConstraintData.h
+++ b/spine-cpp/spine-cpp/include/spine/TransformConstraintData.h
@@ -68,7 +68,7 @@ namespace Spine {
         bool isRelative();
         bool isLocal();
 
-        String toString() const;
+
         
     private:
         const String _name;
diff --git a/spine-cpp/spine-cpp/include/spine/Triangulator.h b/spine-cpp/spine-cpp/include/spine/Triangulator.h
index 4330b30de..8d04ce0fc 100644
--- a/spine-cpp/spine-cpp/include/spine/Triangulator.h
+++ b/spine-cpp/spine-cpp/include/spine/Triangulator.h
@@ -37,28 +37,24 @@
 namespace Spine {
 class Triangulator : public SpineObject {
 public:
+	~Triangulator();
+
 	Vector<int> &triangulate(Vector<float> &vertices);
 
-	Vector<Vector < float>* >
-	decompose(Vector<float>
-	& vertices,
-	Vector<int> &triangles
-	);
+	Vector< Vector<float>* > &decompose(Vector<float> &vertices, Vector<int> &triangles);
+
 
-	String toString() const;
 
 private:
-	Vector<Vector < float>* >
-	_convexPolygons;
-	Vector<Vector < int>* >
-	_convexPolygonsIndices;
+	Vector<Vector < float>* > _convexPolygons;
+	Vector<Vector < int>* > _convexPolygonsIndices;
 
 	Vector<int> _indices;
 	Vector<bool> _isConcaveArray;
 	Vector<int> _triangles;
 
-	Pool <Vector<float>> _polygonPool;
-	Pool <Vector<int>> _polygonIndicesPool;
+	Pool <Vector<float> > _polygonPool;
+	Pool <Vector<int> > _polygonIndicesPool;
 
 	static bool isConcave(int index, int vertexCount, Vector<float> &vertices, Vector<int> &indices);
 
diff --git a/spine-cpp/spine-cpp/include/spine/Vector.h b/spine-cpp/spine-cpp/include/spine/Vector.h
index 6d01f4fa0..ac0b13c0e 100644
--- a/spine-cpp/spine-cpp/include/spine/Vector.h
+++ b/spine-cpp/spine-cpp/include/spine/Vector.h
@@ -196,18 +196,6 @@ public:
 		return _buffer;
 	}
 
-	String toString() const {
-		String str;
-		str.append("Vector { size: ").append((int) _size).append(", items: [\n");
-		for (size_t i = 0; i < _size; i++) {
-			str.append("   ").append(_buffer[i]);
-			if (i != _size - 1) str.append(",\n");
-			else str.append("\n");
-		}
-		str.append("] }");
-		return str;
-	}
-
 private:
 	size_t _size;
 	size_t _capacity;
diff --git a/spine-cpp/spine-cpp/include/spine/Vertices.h b/spine-cpp/spine-cpp/include/spine/Vertices.h
index 24eb79aab..d9e4f1d23 100644
--- a/spine-cpp/spine-cpp/include/spine/Vertices.h
+++ b/spine-cpp/spine-cpp/include/spine/Vertices.h
@@ -38,10 +38,6 @@ class Vertices : public SpineObject {
 public:
 	Vector<int> _bones;
 	Vector<float> _vertices;
-
-	String toString() const {
-		return String("Vertices");
-	};
 };
 }
 
diff --git a/spine-cpp/spine-cpp/src/spine/Animation.cpp b/spine-cpp/spine-cpp/src/spine/Animation.cpp
index 77b95b35e..a8e5e6267 100644
--- a/spine-cpp/spine-cpp/src/spine/Animation.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Animation.cpp
@@ -140,12 +140,4 @@ int Animation::linearSearch(Vector<float> &values, float target, int step) {
 
 	return -1;
 }
-
-String Animation::toString() const {
-	String str;
-	str.append("Animation { name: ").appendString(_name).append(", duration: ").append(_duration);
-	str.append(",\n timelines: ").appendString(_timelines.toString());
-	str.append("}");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp
index 6588866a4..d92ce8225 100644
--- a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp
+++ b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp
@@ -212,20 +212,12 @@ void TrackEntry::reset() {
 	_onAnimationEventFunc = dummyOnAnimationEventFunc;
 }
 
-String TrackEntry::toString() const {
-	return String("TrackEntry");
-}
-
 EventQueueEntry::EventQueueEntry(EventType eventType, TrackEntry *trackEntry, Event *event) :
 		_type(eventType),
 		_entry(trackEntry),
 		_event(event) {
 }
 
-String EventQueueEntry::toString() const {
-	return String("EventQueueEntry");
-}
-
 EventQueue *EventQueue::newEventQueue(AnimationState &state, Pool<TrackEntry> &trackEntryPool) {
 	return new(__FILE__, __LINE__) EventQueue(state, trackEntryPool);
 }
@@ -311,10 +303,6 @@ void EventQueue::drain() {
 	_drainDisabled = false;
 }
 
-String EventQueue::toString() const {
-	return String("EventQueue");
-}
-
 const int AnimationState::Subsequent = 0;
 const int AnimationState::First = 1;
 const int AnimationState::Dip = 2;
@@ -330,6 +318,24 @@ AnimationState::AnimationState(AnimationStateData *data) :
 }
 
 AnimationState::~AnimationState() {
+	for (int i = 0; i < _tracks.size(); i++) {
+		TrackEntry* entry = _tracks[i];
+		if (entry) {
+			TrackEntry* from = entry->_mixingFrom;
+			while (from) {
+				TrackEntry* curr = from;
+				from = curr->_mixingFrom;
+				delete curr;
+			}
+			TrackEntry* next = entry->_next;
+			while (next) {
+				TrackEntry* curr = next;
+				next = curr->_next;
+				delete curr;
+			}
+			delete entry;
+		}
+	}
 	delete _queue;
 }
 
@@ -975,7 +981,4 @@ void AnimationState::animationsChanged() {
 	}
 }
 
-String AnimationState::toString() const {
-	return String("AnimationState");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp b/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp
index 5c5d158e3..0facd1916 100644
--- a/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp
+++ b/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp
@@ -74,10 +74,6 @@ void AnimationStateData::setDefaultMix(float inValue) {
 	_defaultMix = inValue;
 }
 
-String AnimationStateData::toString() const {
-	return String("AnimationStateData");
-}
-
 AnimationStateData::AnimationPair::AnimationPair(Animation *a1, Animation *a2) : _a1(a1), _a2(a2) {
 }
 
@@ -85,12 +81,6 @@ bool AnimationStateData::AnimationPair::operator==(const AnimationPair &other) c
 	return _a1->_name == other._a1->_name && _a2->_name == other._a2->_name;
 }
 
-String AnimationStateData::AnimationPair::toString() const {
-	String str;
-	str.append("AnimationPair { ").append(_a1->_name).append(" -> ").append(_a2->_name).append(" } ");
-	return str;
-}
-
 std::size_t
 AnimationStateData::HashAnimationPair::operator()(const Spine::AnimationStateData::AnimationPair &val) const {
 	std::size_t h1 = 7;
diff --git a/spine-cpp/spine-cpp/src/spine/Atlas.cpp b/spine-cpp/spine-cpp/src/spine/Atlas.cpp
index 92930c3f5..103885796 100644
--- a/spine-cpp/spine-cpp/src/spine/Atlas.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Atlas.cpp
@@ -349,7 +349,4 @@ int Atlas::toInt(Str *str) {
 	return (int) strtol(str->begin, (char **) &str->end, 10);
 }
 
-String Atlas::toString() const {
-	return String("Atlas");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp b/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp
index 90f89f9a6..e937dc547 100644
--- a/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp
+++ b/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp
@@ -112,7 +112,4 @@ AtlasRegion *AtlasAttachmentLoader::findRegion(const String &name) {
 	return _atlas->findRegion(name);
 }
 
-String AtlasAttachmentLoader::toString() const {
-	return String("AtlasAttachmentLoader");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/Bone.cpp b/spine-cpp/spine-cpp/src/spine/Bone.cpp
index c6c119125..c635879cb 100644
--- a/spine-cpp/spine-cpp/src/spine/Bone.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Bone.cpp
@@ -545,11 +545,4 @@ void Bone::updateAppliedTransform() {
 	}
 }
 
-String Bone::toString() const {
-	String str;
-	str.append("Bone { name: ").appendString(_data.getName());
-	str.append(", a: ").append(_a).append(", b: ").append(_b).append(", c").append(_c).append(", d: ").append(_d);
-	str.append(", worldX: ").append(_worldX).append(", worldY: ").append(_worldY).append(" }");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/BoneData.cpp b/spine-cpp/spine-cpp/src/spine/BoneData.cpp
index d9356744b..aefcefd14 100644
--- a/spine-cpp/spine-cpp/src/spine/BoneData.cpp
+++ b/spine-cpp/spine-cpp/src/spine/BoneData.cpp
@@ -134,7 +134,4 @@ void BoneData::setTransformMode(TransformMode inValue) {
 	_transformMode = inValue;
 }
 
-String BoneData::toString() const {
-	return String("BoneData");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp b/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp
index 15a10a63d..bfde45b02 100644
--- a/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp
@@ -35,12 +35,4 @@ RTTI_IMPL(BoundingBoxAttachment, VertexAttachment);
 
 BoundingBoxAttachment::BoundingBoxAttachment(const String &name) : VertexAttachment(name) {
 }
-
-String BoundingBoxAttachment::toString() const {
-	String str;
-	str.append("BoundingBoxAttachment { name: ").appendString(getName()).append(", worldVerticesLength: ").append(
-			_worldVerticesLength);
-	str.append(",\n bones: ").append(_bones).append(",\n weights: ").append(_vertices).append(" }");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp b/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp
index 941de04f0..7ce1712a5 100644
--- a/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp
@@ -45,12 +45,4 @@ SlotData *ClippingAttachment::getEndSlot() {
 void ClippingAttachment::setEndSlot(SlotData *inValue) {
 	_endSlot = inValue;
 }
-
-String ClippingAttachment::toString() const {
-	String str;
-	str.append("Clipping { name: ").appendString(getName());
-	str.append(", worldVerticesLength: ").append(_worldVerticesLength);
-	str.append(", bones: ").append(_bones).append(", weights: ").append(_vertices).append(" }");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/Event.cpp b/spine-cpp/spine-cpp/src/spine/Event.cpp
index a82e89e5e..f93a7caf4 100644
--- a/spine-cpp/spine-cpp/src/spine/Event.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Event.cpp
@@ -73,7 +73,4 @@ void Event::setStringValue(const String &inValue) {
 	_stringValue = inValue;
 }
 
-String Event::toString() const {
-	return String("Event");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/EventData.cpp b/spine-cpp/spine-cpp/src/spine/EventData.cpp
index e384e6eec..118420661 100644
--- a/spine-cpp/spine-cpp/src/spine/EventData.cpp
+++ b/spine-cpp/spine-cpp/src/spine/EventData.cpp
@@ -70,7 +70,4 @@ void EventData::setStringValue(const String &inValue) {
 	_stringValue = inValue;
 }
 
-String EventData::toString() const {
-	return String("EventData");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp b/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp
index 9f5d0f1e2..e79a905df 100644
--- a/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp
+++ b/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp
@@ -258,10 +258,4 @@ void IkConstraint::setMix(float inValue) {
 	_mix = inValue;
 }
 
-String IkConstraint::toString() const {
-	String str;
-	str.append("IkConstraint { name: ").appendString(_data.getName());
-	str.append("}");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp b/spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp
index c6eda3660..cdbfaa4de 100644
--- a/spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp
+++ b/spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp
@@ -81,7 +81,4 @@ void IkConstraintData::setMix(float inValue) {
 	_mix = inValue;
 }
 
-String IkConstraintData::toString() const {
-	return String("IkConstraintData");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/Json.cpp b/spine-cpp/spine-cpp/src/spine/Json.cpp
index a379abcab..a1308bc0a 100644
--- a/spine-cpp/spine-cpp/src/spine/Json.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Json.cpp
@@ -538,7 +538,4 @@ int Json::json_strcasecmp(const char *s1, const char *s2) {
 	}
 }
 
-String Json::toString() const {
-	return String("Json");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp b/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp
index dbeececac..2f4602698 100644
--- a/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp
+++ b/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp
@@ -40,7 +40,4 @@ LinkedMesh::LinkedMesh(MeshAttachment *mesh, const String &skin, int slotIndex,
 		_parent(parent) {
 }
 
-String LinkedMesh::toString() const {
-	return String("LinkedMesh");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp b/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp
index a171cb456..6662694e0 100644
--- a/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp
@@ -272,9 +272,4 @@ Spine::Color &MeshAttachment::getColor() {
 	return _color;
 }
 
-String MeshAttachment::toString() const {
-	String str;
-	str.append("RegionAttachment { name: ").appendString(getName()).append(", path: ").appendString(_path).append(" }");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp b/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp
index b30ca235f..9d4e0c2b1 100644
--- a/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp
@@ -61,12 +61,4 @@ void PathAttachment::setConstantSpeed(bool inValue) {
 	_constantSpeed = inValue;
 }
 
-String PathAttachment::toString() const {
-	String str;
-	str.append("PathAttachment { name: ").appendString(getName()).append(", closed: ").append(_closed).append(
-			", constantSpeed: ").append(_constantSpeed);
-	str.append(", worldVerticesLength: ").append(_worldVerticesLength);
-	str.append(", bones: ").append(_bones).append(", weights: ").append(_vertices).append(" }");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp
index 59ea7199d..44506d96a 100644
--- a/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp
@@ -547,9 +547,4 @@ void PathConstraint::addCurvePosition(float p, float x1, float y1, float cx1, fl
 	}
 }
 
-String PathConstraint::toString() const {
-	String str;
-	str.append("TransformConstraint { name: ").appendString(_data.getName()).append(" }");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp
index d025a8e2f..1ad2ab5ba 100644
--- a/spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp
@@ -139,9 +139,4 @@ void PathConstraintData::setTranslateMix(float inValue) {
 	_translateMix = inValue;
 }
 
-String PathConstraintData::toString() const {
-	String str;
-	str.append("PathConstraintData { name: ").appendString(_name).append(" }");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp b/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp
index 0b4107158..f6723f5f8 100644
--- a/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp
@@ -77,9 +77,4 @@ void PointAttachment::setRotation(float inValue) {
 	_rotation = inValue;
 }
 
-String PointAttachment::toString() const {
-	String str;
-	str.append("PointAttachment { name: ").appendString(getName()).append(" }");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/RTTI.cpp b/spine-cpp/spine-cpp/src/spine/RTTI.cpp
index e5e6ebc3e..29daaf86c 100644
--- a/spine-cpp/spine-cpp/src/spine/RTTI.cpp
+++ b/spine-cpp/spine-cpp/src/spine/RTTI.cpp
@@ -60,9 +60,4 @@ bool RTTI::instanceOf(const RTTI &rtti) const {
 	return false;
 }
 
-String RTTI::toString() const {
-	String str;
-	str.append("RTTI { name: ").append(_className.c_str()).append(" }");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp b/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp
index e442f0865..f441db5b2 100644
--- a/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp
@@ -283,10 +283,4 @@ Vector<float> &RegionAttachment::getUVs() {
 Spine::Color &RegionAttachment::getColor() {
 	return _color;
 }
-
-String RegionAttachment::toString() const {
-	String str;
-	str.append("RegionAttachment { name: ").appendString(getName()).append(", path: ").appendString(_path).append(" }");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp b/spine-cpp/spine-cpp/src/spine/Skeleton.cpp
index e3bdfa8ce..85de4a5f9 100644
--- a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Skeleton.cpp
@@ -644,16 +644,4 @@ void Skeleton::sortReset(Vector<Bone *> &bones) {
 		bone->_sorted = false;
 	}
 }
-
-String Skeleton::toString() const {
-	String str;
-
-	str.append("Skeleton {\n");
-	str.append("   bones: ").append(_bones);
-	str.append(",\n slots: ").append(_slots);
-	str.append(",\n drawOrder: ").append(_drawOrder);
-	str.append(",\n animations: ").append(_data->getAnimations());
-	str.append(" }");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp
index 9eac19500..36e8521e4 100644
--- a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp
+++ b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp
@@ -1008,8 +1008,4 @@ void SkeletonBinary::readCurve(DataInput *input, int frameIndex, CurveTimeline *
 		}
 	}
 }
-
-String SkeletonBinary::toString() const {
-	return String("SkeletonBinary");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp
index f1b174ef0..f85188f41 100644
--- a/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp
+++ b/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp
@@ -232,14 +232,5 @@ void SkeletonBounds::aabbCompute() {
 	_maxY = maxY;
 }
 
-String SkeletonBounds::toString() const {
-	return String("SkeletonBounds");
-}
-
-String Polygon::toString() const {
-	String str;
-	str.append("Polygon { count: ").append(_count).append(", vertices: ").append(_vertices).append(" }");
-	return str;
-}
 }
 
diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp
index 8cf31d858..efe09d9bf 100644
--- a/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp
+++ b/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp
@@ -52,20 +52,17 @@ int SkeletonClipping::clipStart(Slot &slot, ClippingAttachment *clip) {
 	_clippingPolygon.setSize(n, 0);
 	clip->computeWorldVertices(slot, 0, n, _clippingPolygon, 0, 2);
 	makeClockwise(_clippingPolygon);
-	Vector<Vector<float> *> clippingPolygons = _triangulator.decompose(_clippingPolygon,
-																	   _triangulator.triangulate(_clippingPolygon));
+	_clippingPolygons = &_triangulator.decompose(_clippingPolygon, _triangulator.triangulate(_clippingPolygon));
 
-	_clippingPolygons.clearAndAddAll(clippingPolygons);
-
-	for (size_t i = 0; i < _clippingPolygons.size(); ++i) {
-		Vector<float> *polygonP = _clippingPolygons[i];
+	for (size_t i = 0; i < _clippingPolygons->size(); ++i) {
+		Vector<float> *polygonP = (*_clippingPolygons)[i];
 		Vector<float> &polygon = *polygonP;
 		makeClockwise(polygon);
 		polygon.add(polygon[0]);
 		polygon.add(polygon[1]);
 	}
 
-	return static_cast<int>(_clippingPolygons.size());
+	return static_cast<int>((*_clippingPolygons).size());
 }
 
 void SkeletonClipping::clipEnd(Slot &slot) {
@@ -80,8 +77,9 @@ void SkeletonClipping::clipEnd() {
 	}
 
 	_clipAttachment = NULL;
-	_clippingPolygons.clear();
+	_clippingPolygons = NULL;
 	_clippedVertices.clear();
+	_clippedUVs.clear();
 	_clippedTriangles.clear();
 	_clippingPolygon.clear();
 }
@@ -91,8 +89,8 @@ void SkeletonClipping::clipTriangles(Vector<float> &vertices, int verticesLength
 	Vector<float> &clipOutput = _clipOutput;
 	Vector<float> &clippedVertices = _clippedVertices;
 	Vector<unsigned short> &clippedTriangles = _clippedTriangles;
-	Vector<Vector<float> *> &polygons = _clippingPolygons;
-	int polygonsCount = static_cast<int>(_clippingPolygons.size());
+	Vector<Vector<float> *> &polygons = *_clippingPolygons;
+	int polygonsCount = static_cast<int>((*_clippingPolygons).size());
 
 	int index = 0;
 	clippedVertices.clear();
@@ -318,7 +316,4 @@ void SkeletonClipping::makeClockwise(Vector<float> &polygon) {
 	}
 }
 
-String SkeletonClipping::toString() const {
-	return String("SkeletonClipping");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonData.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonData.cpp
index 869a5c5cd..41f9b06f3 100644
--- a/spine-cpp/spine-cpp/src/spine/SkeletonData.cpp
+++ b/spine-cpp/spine-cpp/src/spine/SkeletonData.cpp
@@ -230,8 +230,4 @@ float SkeletonData::getFps() {
 void SkeletonData::setFps(float inValue) {
 	_fps = inValue;
 }
-
-String SkeletonData::toString() const {
-	return String("SkeletonData");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp
index 5c6556d04..3f47b3134 100644
--- a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp
+++ b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp
@@ -1213,8 +1213,4 @@ void SkeletonJson::setError(Json *root, const String &value1, const String &valu
 
 	delete root;
 }
-
-String SkeletonJson::toString() const {
-	return String("SkeletonJson");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/Skin.cpp b/spine-cpp/spine-cpp/src/spine/Skin.cpp
index ee1994f9e..5ad008818 100644
--- a/spine-cpp/spine-cpp/src/spine/Skin.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Skin.cpp
@@ -47,12 +47,6 @@ bool Skin::AttachmentKey::operator==(const AttachmentKey &other) const {
 	return _slotIndex == other._slotIndex && _name == other._name;
 }
 
-String Skin::AttachmentKey::toString() const {
-	String str;
-	str.append("AttachmentKey { slotIndex: ").append(_slotIndex).append(", name: ").appendString(_name).append(" }");
-	return str;
-}
-
 std::size_t Skin::HashAttachmentKey::operator()(const Spine::Skin::AttachmentKey &val) const {
 	std::size_t h1 = val._slotIndex;
 	return h1;
@@ -128,12 +122,4 @@ void Skin::attachAll(Skeleton &skeleton, Skin &oldSkin) {
 		}
 	}
 }
-
-String Skin::toString() const {
-	String str;
-	str.append("Skin { name: ").appendString(_name);
-	str.append(",\n attachments: ").append(_attachments);
-	str.append(" }");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/Slot.cpp b/spine-cpp/spine-cpp/src/spine/Slot.cpp
index ea52fc601..f6964409d 100644
--- a/spine-cpp/spine-cpp/src/spine/Slot.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Slot.cpp
@@ -118,12 +118,4 @@ void Slot::setAttachmentVertices(Vector<float> &inValue) {
 	_attachmentVertices.clearAndAddAll(inValue);
 }
 
-String Slot::toString() const {
-	String str;
-	str.append("Slot { name: ").appendString(_data.getName());
-	str.append(", color: ").appendString(_color.toString());
-	if (_hasDarkColor) str.append(", darkColor: ").appendString(_darkColor.toString());
-	str.append("}");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/SlotData.cpp b/spine-cpp/spine-cpp/src/spine/SlotData.cpp
index 0eee327a3..eb8cbb46f 100644
--- a/spine-cpp/spine-cpp/src/spine/SlotData.cpp
+++ b/spine-cpp/spine-cpp/src/spine/SlotData.cpp
@@ -90,7 +90,4 @@ void SlotData::setBlendMode(BlendMode inValue) {
 	_blendMode = inValue;
 }
 
-String SlotData::toString() const {
-	return String("SlotData");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/Timeline.cpp b/spine-cpp/spine-cpp/src/spine/Timeline.cpp
index f4b379d75..206afbcb9 100644
--- a/spine-cpp/spine-cpp/src/spine/Timeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Timeline.cpp
@@ -42,9 +42,4 @@ Timeline::Timeline() {
 Timeline::~Timeline() {
 }
 
-String Timeline::toString() const {
-	String str;
-	str.appendString(getRTTI().toString());
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp b/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp
index 3635831a4..d4b224f67 100644
--- a/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp
+++ b/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp
@@ -376,10 +376,4 @@ void TransformConstraint::applyRelativeLocal() {
 		bone.updateWorldTransform(x, y, rotation, scaleX, scaleY, bone._ashearX, shearY);
 	}
 }
-
-String TransformConstraint::toString() const {
-	String str;
-	str.append("TransformConstraint { name: ").appendString(_data.getName()).append(" }");
-	return str;
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp b/spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp
index be91cd21c..ea4b7f232 100644
--- a/spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp
+++ b/spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp
@@ -118,7 +118,4 @@ bool TransformConstraintData::isLocal() {
 	return _local;
 }
 
-String TransformConstraintData::toString() const {
-	return String("TransformConstraintData");
-}
 }
diff --git a/spine-cpp/spine-cpp/src/spine/Triangulator.cpp b/spine-cpp/spine-cpp/src/spine/Triangulator.cpp
index 717b0796a..fa5e8e786 100644
--- a/spine-cpp/spine-cpp/src/spine/Triangulator.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Triangulator.cpp
@@ -33,6 +33,12 @@
 #include <spine/MathUtil.h>
 
 namespace Spine {
+
+Triangulator::~Triangulator() {
+	ContainerUtil::cleanUpVectorOfPointers(_convexPolygons);
+	ContainerUtil::cleanUpVectorOfPointers(_convexPolygonsIndices);
+}
+
 Vector<int> &Triangulator::triangulate(Vector<float> &vertices) {
 	int vertexCount = static_cast<int>(vertices.size() >> 1);
 
@@ -123,14 +129,14 @@ Vector<int> &Triangulator::triangulate(Vector<float> &vertices) {
 	return triangles;
 }
 
-Vector<Vector<float> *> Triangulator::decompose(Vector<float> &vertices, Vector<int> &triangles) {
+Vector<Vector<float> *> &Triangulator::decompose(Vector<float> &vertices, Vector<int> &triangles) {
 	Vector<Vector<float> *> &convexPolygons = _convexPolygons;
 	for (size_t i = 0, n = convexPolygons.size(); i < n; ++i) {
 		_polygonPool.free(convexPolygons[i]);
 	}
 	convexPolygons.clear();
 
-	Vector<Vector<int> *> convexPolygonsIndices = _convexPolygonsIndices;
+	Vector<Vector<int> *> &convexPolygonsIndices = _convexPolygonsIndices;
 	for (size_t i = 0, n = convexPolygonsIndices.size(); i < n; ++i) {
 		_polygonIndicesPool.free(convexPolygonsIndices[i]);
 	}
@@ -291,7 +297,4 @@ int Triangulator::winding(float p1x, float p1y, float p2x, float p2y, float p3x,
 	return p3x * py - p3y * px + px * p1y - p1x * py >= 0 ? 1 : -1;
 }
 
-String Triangulator::toString() const {
-	return String("Triangulator");
-}
 }
diff --git a/spine-sfml/cpp/example/main.cpp b/spine-sfml/cpp/example/main.cpp
index 6125ab8e9..387fb12f3 100644
--- a/spine-sfml/cpp/example/main.cpp
+++ b/spine-sfml/cpp/example/main.cpp
@@ -197,6 +197,8 @@ void goblins (SkeletonData* skeletonData, Atlas* atlas) {
 		window.draw(*drawable);
 		window.display();
 	}
+
+	delete drawable;
 }
 
 void raptor (SkeletonData* skeletonData, Atlas* atlas) {
@@ -238,6 +240,8 @@ void raptor (SkeletonData* skeletonData, Atlas* atlas) {
 		window.display();
 	}
 	// BOZO spSwirlVertexEffect_dispose(effect);
+
+	delete drawable;
 }
 
 void tank (SkeletonData* skeletonData, Atlas* atlas) {
@@ -266,6 +270,8 @@ void tank (SkeletonData* skeletonData, Atlas* atlas) {
 		window.draw(*drawable);
 		window.display();
 	}
+
+	delete drawable;
 }
 
 void vine (SkeletonData* skeletonData, Atlas* atlas) {
@@ -295,6 +301,8 @@ void vine (SkeletonData* skeletonData, Atlas* atlas) {
 		window.draw(*drawable);
 		window.display();
 	}
+
+	delete drawable;
 }
 
 void stretchyman (SkeletonData* skeletonData, Atlas* atlas) {
@@ -360,6 +368,8 @@ void coin (SkeletonData* skeletonData, Atlas* atlas) {
 		window.draw(*drawable);
 		window.display();
 	}
+
+	delete drawable;
 }
 
 void owl (SkeletonData* skeletonData, Atlas* atlas) {
@@ -413,6 +423,8 @@ void owl (SkeletonData* skeletonData, Atlas* atlas) {
 		window.draw(*drawable);
 		window.display();
 	}
+
+	delete drawable;
 }
 
 /**
@@ -429,8 +441,6 @@ void test (SkeletonData* skeletonData, Atlas* atlas) {
 		animState->update(d);
 		animState->apply(*skeleton);
 		skeleton->updateWorldTransform();
-		printf("%s\n", skeleton->toString().buffer());
-		printf("========================================\n");
 		d += 0.1f;
 	}
 
@@ -441,9 +451,8 @@ void test (SkeletonData* skeletonData, Atlas* atlas) {
 
 int main () {
 	DebugExtension dbgExtension;
-	// SpineExtension::setInstance(&dbgExtension);
+	SpineExtension::setInstance(&dbgExtension);
 	testcase(test, "data/tank-pro.json", "data/tank-pro.skel", "data/tank.atlas", 1.0f);
-	testcase(coin, "data/coin-pro.json", "data/coin-pro.skel", "data/coin.atlas", 0.5f);
 	testcase(spineboy, "data/spineboy-ess.json", "data/spineboy-ess.skel", "data/spineboy.atlas", 0.6f);
 	testcase(owl, "data/owl-pro.json", "data/owl-pro.skel", "data/owl.atlas", 0.5f);
 	testcase(coin, "data/coin-pro.json", "data/coin-pro.skel", "data/coin.atlas", 0.5f);