Changing RTTI to SPINE_RTTI and RTTI.h/cpp to SpineRTTI.h/cpp

2026-02-05 23:05:01 +08:00 · 2017-11-19 19:01:30 -05:00 · 2017-11-19 19:01:30 -05:00 · 5bba269f13
commit 5bba269f13
parent 44194018ad
69 changed files with 103 additions and 103 deletions
--- a/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h
+++ b/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h
@ -45,7 +45,7 @@ namespace Spine
    ///
    class AtlasAttachmentLoader : public AttachmentLoader
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        AtlasAttachmentLoader (Vector<Atlas*>& inAtlasArray) : _atlasArray(inAtlasArray)
--- a/spine-cpp/spine-cpp/include/spine/Attachment.h
+++ b/spine-cpp/spine-cpp/include/spine/Attachment.h
@ -31,7 +31,7 @@
 #ifndef Spine_Attachment_h
 #define Spine_Attachment_h

-#include <spine/RTTI.h>
+#include <spine/SpineRTTI.h>

 #include <string>

@ -39,7 +39,7 @@ namespace Spine
 {
    class Attachment
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        Attachment(std::string name);
--- a/spine-cpp/spine-cpp/include/spine/AttachmentLoader.h
+++ b/spine-cpp/spine-cpp/include/spine/AttachmentLoader.h
@ -31,7 +31,7 @@
 #ifndef Spine_AttachmentLoader_h
 #define Spine_AttachmentLoader_h

-#include <spine/RTTI.h>
+#include <spine/SpineRTTI.h>

 #include <string>

@ -47,7 +47,7 @@ namespace Spine
    
    class AttachmentLoader
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
        /// @return May be NULL to not load any attachment.
        virtual RegionAttachment* newRegionAttachment(Skin& skin, std::string name, std::string path) = 0;
--- a/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h
@ -46,7 +46,7 @@ namespace Spine
    
    class AttachmentTimeline : public Timeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        AttachmentTimeline(int frameCount)
--- a/spine-cpp/spine-cpp/include/spine/Bone.h
+++ b/spine-cpp/spine-cpp/include/spine/Bone.h
@ -47,7 +47,7 @@ namespace Spine
    /// constraint or application code modifies the world transform after it was computed from the local transform.
    class Bone : public Updatable
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
        friend class RotateTimeline;
        friend class IkConstraint;
--- a/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h
@ -38,7 +38,7 @@ namespace Spine
    /// Attachment that has a polygon for bounds checking.
    class BoundingBoxAttachment : public VertexAttachment
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
        BoundingBoxAttachment(std::string name);
    };
--- a/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h
@ -39,7 +39,7 @@ namespace Spine
    
    class ClippingAttachment : public VertexAttachment
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        ClippingAttachment(std::string name);
--- a/spine-cpp/spine-cpp/include/spine/ColorTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/ColorTimeline.h
@ -37,7 +37,7 @@ namespace Spine
 {
    class ColorTimeline : public CurveTimeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
 //        public const int ENTRIES = 5;
 //        protected const int PREV_TIME = -5, PREV_R = -4, PREV_G = -3, PREV_B = -2, PREV_A = -1;
--- a/spine-cpp/spine-cpp/include/spine/Constraint.h
+++ b/spine-cpp/spine-cpp/include/spine/Constraint.h
@ -38,7 +38,7 @@ namespace Spine
    /// The interface for all constraints.
    class Constraint : public Updatable
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        Constraint();
--- a/spine-cpp/spine-cpp/include/spine/CurveTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/CurveTimeline.h
@ -41,7 +41,7 @@ namespace Spine
    /// Base class for frames that use an interpolation bezier curve.
    class CurveTimeline : public Timeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        CurveTimeline(int frameCount);
--- a/spine-cpp/spine-cpp/include/spine/DeformTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/DeformTimeline.h
@ -37,7 +37,7 @@ namespace Spine
 {
    class DeformTimeline : CurveTimeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
 //        internal int slotIndex;
 //        internal float[] frames;
--- a/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h
@ -37,7 +37,7 @@ namespace Spine
 {
    class DrawOrderTimeline : public Timeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
 //        internal float[] frames;
 //        private int[][] drawOrders;
--- a/spine-cpp/spine-cpp/include/spine/EventTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/EventTimeline.h
@ -37,7 +37,7 @@ namespace Spine
 {
    class EventTimeline : public Timeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
 //        internal float[] frames;
 //        private Event[] events;
--- a/spine-cpp/spine-cpp/include/spine/IkConstraint.h
+++ b/spine-cpp/spine-cpp/include/spine/IkConstraint.h
@ -45,7 +45,7 @@ namespace Spine
    {
        friend class Skeleton;
        
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        /// Adjusts the bone rotation so the tip is as close to the target position as possible. The target is specified
--- a/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h
@ -37,7 +37,7 @@ namespace Spine
 {
    class IkConstraintTimeline : public CurveTimeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
 //        public const int ENTRIES = 3;
 //        private const int PREV_TIME = -3, PREV_MIX = -2, PREV_BEND_DIRECTION = -1;
--- a/spine-cpp/spine-cpp/include/spine/MeshAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/MeshAttachment.h
@ -42,7 +42,7 @@ namespace Spine
    /// Attachment that displays a texture region using a mesh.
    class MeshAttachment : public VertexAttachment
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        MeshAttachment(std::string name);
--- a/spine-cpp/spine-cpp/include/spine/PathAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/PathAttachment.h
@ -37,7 +37,7 @@ namespace Spine
 {
    class PathAttachment : public VertexAttachment
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        PathAttachment(std::string name);
--- a/spine-cpp/spine-cpp/include/spine/PathConstraint.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraint.h
@ -47,7 +47,7 @@ namespace Spine
    {
        friend class Skeleton;
        
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        PathConstraint(PathConstraintData& data, Skeleton& skeleton);
--- a/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h
@ -37,7 +37,7 @@ namespace Spine
 {
    class PathConstraintMixTimeline : public CurveTimeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
 //        public const int ENTRIES = 3;
 //        private const int PREV_TIME = -3, PREV_ROTATE = -2, PREV_TRANSLATE = -1;
--- a/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h
@ -37,7 +37,7 @@ namespace Spine
 {
    class PathConstraintPositionTimeline : public CurveTimeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
 //        public const int ENTRIES = 2;
 //        protected const int PREV_TIME = -2, PREV_VALUE = -1;
--- a/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h
@ -37,7 +37,7 @@ namespace Spine
 {
    class PathConstraintSpacingTimeline : public PathConstraintPositionTimeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
 //        override public int PropertyId {
 //            get { return ((int)TimelineType.PathConstraintSpacing << 24) + pathConstraintIndex; }
--- a/spine-cpp/spine-cpp/include/spine/PointAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/PointAttachment.h
@ -46,7 +46,7 @@ namespace Spine
    /// 
    class PointAttachment : public Attachment
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        PointAttachment(std::string name);
--- a/spine-cpp/spine-cpp/include/spine/RegionAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/RegionAttachment.h
@ -46,7 +46,7 @@ namespace Spine
    /// Attachment that displays a texture region.
    class RegionAttachment : public Attachment
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        RegionAttachment(std::string name);
--- a/spine-cpp/spine-cpp/include/spine/RotateTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/RotateTimeline.h
@ -37,7 +37,7 @@ namespace Spine
 {
    class RotateTimeline : public CurveTimeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        static const int ENTRIES = 2;
--- a/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h
@ -37,7 +37,7 @@ namespace Spine
 {
    class ScaleTimeline : public TranslateTimeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
 //        override public int PropertyId {
 //            get { return ((int)TimelineType.Scale << 24) + boneIndex; }
--- a/spine-cpp/spine-cpp/include/spine/ShearTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/ShearTimeline.h
@ -37,7 +37,7 @@ namespace Spine
 {
    class ShearTimeline : public TranslateTimeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
 //        override public int PropertyId {
 //            get { return ((int)TimelineType.Shear << 24) + boneIndex; }
--- a/spine-cpp/spine-cpp/include/spine/SpineRTTI.h
+++ b/spine-cpp/spine-cpp/include/spine/SpineRTTI.h
@ -28,48 +28,48 @@
 * POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#ifndef Spine_RTTI_h
-#define Spine_RTTI_h
+#ifndef Spine_SPINE_RTTI_h
+#define Spine_SPINE_RTTI_h

 #include <string>

 namespace Spine
 {
-    class RTTI
+    class SPINE_RTTI
    {
    public:
-        RTTI(const std::string& className);
+        SPINE_RTTI(const std::string& className);
        
-        RTTI(const std::string& className, const RTTI& baseRTTI);
+        SPINE_RTTI(const std::string& className, const SPINE_RTTI& baseSPINE_RTTI);
        
        const std::string& getClassName() const;
        
-        bool isExactly(const RTTI& rtti) const;
+        bool isExactly(const SPINE_RTTI& rtti) const;
        
-        bool derivesFrom(const RTTI& rtti) const;
+        bool derivesFrom(const SPINE_RTTI& rtti) const;
        
    private:
        // Prevent copying
-        RTTI(const RTTI& obj);
-        RTTI& operator=(const RTTI& obj);
+        SPINE_RTTI(const SPINE_RTTI& obj);
+        SPINE_RTTI& operator=(const SPINE_RTTI& obj);
        
        const std::string m_className;
-        const RTTI *m_pBaseRTTI;
+        const SPINE_RTTI *m_pBaseSPINE_RTTI;
    };
 }

-#define RTTI_DECL \
+#define SPINE_RTTI_DECL \
 public: \
-static const Spine::RTTI rtti; \
-virtual const Spine::RTTI& getRTTI();
+static const Spine::SPINE_RTTI rtti; \
+virtual const Spine::SPINE_RTTI& getSPINE_RTTI();

-#define RTTI_IMPL_NOPARENT(name) \
-const Spine::RTTI name::rtti(#name); \
-const Spine::RTTI& name::getRTTI() { return rtti; }
+#define SPINE_RTTI_IMPL_NOPARENT(name) \
+const Spine::SPINE_RTTI name::rtti(#name); \
+const Spine::SPINE_RTTI& name::getSPINE_RTTI() { return rtti; }

-#define RTTI_IMPL(name,parent) \
-const Spine::RTTI name::rtti(#name, parent::rtti); \
-const Spine::RTTI& name::getRTTI() { return rtti; }
+#define SPINE_RTTI_IMPL(name,parent) \
+const Spine::SPINE_RTTI name::rtti(#name, parent::rtti); \
+const Spine::SPINE_RTTI& name::getSPINE_RTTI() { return rtti; }

-#endif /* Spine_RTTI_h */
+#endif /* Spine_SPINE_RTTI_h */

--- a/spine-cpp/spine-cpp/include/spine/Timeline.h
+++ b/spine-cpp/spine-cpp/include/spine/Timeline.h
@ -31,7 +31,7 @@
 #ifndef Spine_Timeline_h
 #define Spine_Timeline_h

-#include <spine/RTTI.h>
+#include <spine/SpineRTTI.h>
 #include <spine/Vector.h>
 #include <spine/MixPose.h>
 #include <spine/MixDirection.h>
@ -43,7 +43,7 @@ namespace Spine
    
    class Timeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        Timeline();
--- a/spine-cpp/spine-cpp/include/spine/TransformConstraint.h
+++ b/spine-cpp/spine-cpp/include/spine/TransformConstraint.h
@ -45,7 +45,7 @@ namespace Spine
    {
        friend class Skeleton;
        
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        TransformConstraint(TransformConstraintData& data, Skeleton& skeleton);
--- a/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h
@ -37,7 +37,7 @@ namespace Spine
 {
    class TransformConstraintTimeline : public CurveTimeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
 //        public const int ENTRIES = 5;
 //        private const int PREV_TIME = -5, PREV_ROTATE = -4, PREV_TRANSLATE = -3, PREV_SCALE = -2, PREV_SHEAR = -1;
--- a/spine-cpp/spine-cpp/include/spine/TranslateTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/TranslateTimeline.h
@ -40,7 +40,7 @@ namespace Spine
 {
    class TranslateTimeline : public CurveTimeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
 //        public const int ENTRIES = 3;
 //        protected const int PREV_TIME = -3, PREV_X = -2, PREV_Y = -1;
--- a/spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h
@ -37,7 +37,7 @@ namespace Spine
 {
    class TwoColorTimeline : public CurveTimeline
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
 //        public const int ENTRIES = 8;
 //        protected const int PREV_TIME = -8, PREV_R = -7, PREV_G = -6, PREV_B = -5, PREV_A = -4;
--- a/spine-cpp/spine-cpp/include/spine/Updatable.h
+++ b/spine-cpp/spine-cpp/include/spine/Updatable.h
@ -31,13 +31,13 @@
 #ifndef Spine_Updatable_h
 #define Spine_Updatable_h

-#include <spine/RTTI.h>
+#include <spine/SpineRTTI.h>

 namespace Spine
 {
    class Updatable
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        Updatable();
--- a/spine-cpp/spine-cpp/include/spine/VertexAttachment.h
+++ b/spine-cpp/spine-cpp/include/spine/VertexAttachment.h
@ -42,7 +42,7 @@ namespace Spine
    /// An attachment with vertices that are transformed by one or more bones and can be deformed by a slot's vertices.
    class VertexAttachment : public Attachment
    {
-        RTTI_DECL;
+        SPINE_RTTI_DECL;
        
    public:
        VertexAttachment(std::string name);
--- a/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp
+++ b/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp
@ -32,5 +32,5 @@

 namespace Spine
 {
-    RTTI_IMPL(AtlasAttachmentLoader, AttachmentLoader);
+    SPINE_RTTI_IMPL(AtlasAttachmentLoader, AttachmentLoader);
 }
--- a/spine-cpp/spine-cpp/src/spine/Attachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Attachment.cpp
@ -34,7 +34,7 @@

 namespace Spine
 {
-    RTTI_IMPL_NOPARENT(Attachment);
+    SPINE_RTTI_IMPL_NOPARENT(Attachment);
    
    Attachment::Attachment(std::string name) : _name(name)
    {
--- a/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp
+++ b/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp
@ -32,5 +32,5 @@

 namespace Spine
 {
-    RTTI_IMPL_NOPARENT(AttachmentLoader);
+    SPINE_RTTI_IMPL_NOPARENT(AttachmentLoader);
 }
--- a/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp
@ -38,5 +38,5 @@

 namespace Spine
 {
-    RTTI_IMPL(AttachmentTimeline, Timeline);
+    SPINE_RTTI_IMPL(AttachmentTimeline, Timeline);
 }
--- a/spine-cpp/spine-cpp/src/spine/Bone.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Bone.cpp
@ -38,7 +38,7 @@

 namespace Spine
 {
-    RTTI_IMPL(Bone, Updatable);
+    SPINE_RTTI_IMPL(Bone, Updatable);
    
    bool Bone::yDown = false;
    
--- a/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp
@ -32,7 +32,7 @@

 namespace Spine
 {
-    RTTI_IMPL(BoundingBoxAttachment, VertexAttachment);
+    SPINE_RTTI_IMPL(BoundingBoxAttachment, VertexAttachment);
    
    BoundingBoxAttachment::BoundingBoxAttachment(std::string name) : VertexAttachment(name)
    {
--- a/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp
@ -34,7 +34,7 @@

 namespace Spine
 {
-    RTTI_IMPL(ClippingAttachment, VertexAttachment);
+    SPINE_RTTI_IMPL(ClippingAttachment, VertexAttachment);
    
    ClippingAttachment::ClippingAttachment(std::string name) : VertexAttachment(name)
    {
--- a/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp
@ -32,5 +32,5 @@

 namespace Spine
 {
-    RTTI_IMPL(ColorTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(ColorTimeline, CurveTimeline);
 }
--- a/spine-cpp/spine-cpp/src/spine/Constraint.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Constraint.cpp
@ -32,7 +32,7 @@

 namespace Spine
 {
-    RTTI_IMPL(Constraint, Updatable);
+    SPINE_RTTI_IMPL(Constraint, Updatable);
    
    Constraint::Constraint()
    {
--- a/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp
@ -34,7 +34,7 @@

 namespace Spine
 {
-    RTTI_IMPL(CurveTimeline, Timeline);
+    SPINE_RTTI_IMPL(CurveTimeline, Timeline);
    
    const float CurveTimeline::LINEAR = 0;
    const float CurveTimeline::STEPPED = 1;
--- a/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp
@ -32,5 +32,5 @@

 namespace Spine
 {
-    RTTI_IMPL(DeformTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(DeformTimeline, CurveTimeline);
 }
--- a/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp
@ -32,5 +32,5 @@

 namespace Spine
 {
-    RTTI_IMPL(DrawOrderTimeline, Timeline);
+    SPINE_RTTI_IMPL(DrawOrderTimeline, Timeline);
 }
--- a/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp
@ -32,5 +32,5 @@

 namespace Spine
 {
-    RTTI_IMPL(EventTimeline, Timeline);
+    SPINE_RTTI_IMPL(EventTimeline, Timeline);
 }
--- a/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp
+++ b/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp
@ -39,7 +39,7 @@

 namespace Spine
 {
-    RTTI_IMPL(IkConstraint, Constraint);
+    SPINE_RTTI_IMPL(IkConstraint, Constraint);
    
    void IkConstraint::apply(Bone& bone, float targetX, float targetY, float alpha)
    {
--- a/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp
@ -32,5 +32,5 @@

 namespace Spine
 {
-    RTTI_IMPL(IkConstraintTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(IkConstraintTimeline, CurveTimeline);
 }
--- a/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp
@ -32,7 +32,7 @@

 namespace Spine
 {
-    RTTI_IMPL(MeshAttachment, VertexAttachment);
+    SPINE_RTTI_IMPL(MeshAttachment, VertexAttachment);
    
    MeshAttachment::MeshAttachment(std::string name) : VertexAttachment(name),
    _regionOffsetX(0),
--- a/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp
@ -32,7 +32,7 @@

 namespace Spine
 {
-    RTTI_IMPL(PathAttachment, VertexAttachment);
+    SPINE_RTTI_IMPL(PathAttachment, VertexAttachment);
    
    PathAttachment::PathAttachment(std::string name) : VertexAttachment(name)
    {
--- a/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp
@ -45,7 +45,7 @@

 namespace Spine
 {
-    RTTI_IMPL(PathConstraint, Constraint);
+    SPINE_RTTI_IMPL(PathConstraint, Constraint);
    
    const float PathConstraint::EPSILON = 0.00001f;
    const int PathConstraint::NONE = -1;
@ -79,7 +79,7 @@ namespace Spine
    void PathConstraint::update()
    {
        Attachment* baseAttachment = _target->getAttachment();
-        if (baseAttachment == NULL || !baseAttachment->getRTTI().derivesFrom(PathAttachment::rtti))
+        if (baseAttachment == NULL || !baseAttachment->getSPINE_RTTI().derivesFrom(PathAttachment::rtti))
        {
            return;
        }
--- a/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp
@ -32,5 +32,5 @@

 namespace Spine
 {
-    RTTI_IMPL(PathConstraintMixTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(PathConstraintMixTimeline, CurveTimeline);
 }
--- a/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp
@ -32,5 +32,5 @@

 namespace Spine
 {
-    RTTI_IMPL(PathConstraintPositionTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(PathConstraintPositionTimeline, CurveTimeline);
 }
--- a/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp
@ -32,5 +32,5 @@

 namespace Spine
 {
-    RTTI_IMPL(PathConstraintSpacingTimeline, PathConstraintPositionTimeline);
+    SPINE_RTTI_IMPL(PathConstraintSpacingTimeline, PathConstraintPositionTimeline);
 }
--- a/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp
@ -36,7 +36,7 @@

 namespace Spine
 {
-    RTTI_IMPL(PointAttachment, Attachment);
+    SPINE_RTTI_IMPL(PointAttachment, Attachment);
    
    PointAttachment::PointAttachment(std::string name) : Attachment(name)
    {
--- a/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp
@ -38,7 +38,7 @@

 namespace Spine
 {
-    RTTI_IMPL(RegionAttachment, Attachment);
+    SPINE_RTTI_IMPL(RegionAttachment, Attachment);
    
    const int RegionAttachment::BLX = 0;
    const int RegionAttachment::BLY = 1;
--- a/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp
@ -40,7 +40,7 @@

 namespace Spine
 {
-    RTTI_IMPL(RotateTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(RotateTimeline, CurveTimeline);
    
    RotateTimeline::RotateTimeline(int frameCount) : CurveTimeline(frameCount), _boneIndex(0)
    {
--- a/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp
@ -32,5 +32,5 @@

 namespace Spine
 {
-    RTTI_IMPL(ScaleTimeline, TranslateTimeline);
+    SPINE_RTTI_IMPL(ScaleTimeline, TranslateTimeline);
 }
--- a/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp
@ -32,5 +32,5 @@

 namespace Spine
 {
-    RTTI_IMPL(ShearTimeline, TranslateTimeline);
+    SPINE_RTTI_IMPL(ShearTimeline, TranslateTimeline);
 }
--- a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Skeleton.cpp
@ -471,7 +471,7 @@ namespace Spine
            int verticesLength = 0;
            Attachment* attachment = slot->getAttachment();
            
-            if (attachment != NULL && attachment->getRTTI().derivesFrom(RegionAttachment::rtti))
+            if (attachment != NULL && attachment->getSPINE_RTTI().derivesFrom(RegionAttachment::rtti))
            {
                RegionAttachment* regionAttachment = static_cast<RegionAttachment*>(attachment);

@ -482,7 +482,7 @@ namespace Spine
                }
                regionAttachment->computeWorldVertices(slot->getBone(), outVertexBuffer, 0);
            }
-            else if (attachment != NULL && attachment->getRTTI().derivesFrom(MeshAttachment::rtti))
+            else if (attachment != NULL && attachment->getSPINE_RTTI().derivesFrom(MeshAttachment::rtti))
            {
                MeshAttachment* mesh = static_cast<MeshAttachment*>(attachment);

@ -699,7 +699,7 @@ namespace Spine
        }
        
        Attachment* attachment = slot->_attachment;
-        if (attachment != NULL && attachment->getRTTI().derivesFrom(PathAttachment::rtti))
+        if (attachment != NULL && attachment->getSPINE_RTTI().derivesFrom(PathAttachment::rtti))
        {
            sortPathConstraintAttachment(attachment, slotBone);
        }
@ -780,7 +780,7 @@ namespace Spine
    
    void Skeleton::sortPathConstraintAttachment(Attachment* attachment, Bone& slotBone)
    {
-        if (attachment == NULL || attachment->getRTTI().derivesFrom(PathAttachment::rtti))
+        if (attachment == NULL || attachment->getSPINE_RTTI().derivesFrom(PathAttachment::rtti))
        {
            return;
        }
--- a/spine-cpp/spine-cpp/src/spine/SpineRTTI.cpp
+++ b/spine-cpp/spine-cpp/src/spine/SpineRTTI.cpp
@ -28,33 +28,33 @@
 * POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/

-#include <spine/RTTI.h>
+#include <spine/SpineRTTI.h>

 namespace Spine
 {
-    RTTI::RTTI(const std::string& className) : m_className(className), m_pBaseRTTI(NULL)
+    SPINE_RTTI::SPINE_RTTI(const std::string& className) : m_className(className), m_pBaseSPINE_RTTI(NULL)
    {
        // Empty
    }
    
-    RTTI::RTTI(const std::string& className, const RTTI& baseRTTI) : m_className(className), m_pBaseRTTI(&baseRTTI)
+    SPINE_RTTI::SPINE_RTTI(const std::string& className, const SPINE_RTTI& baseSPINE_RTTI) : m_className(className), m_pBaseSPINE_RTTI(&baseSPINE_RTTI)
    {
        // Empty
    }
    
-    const std::string& RTTI::getClassName() const
+    const std::string& SPINE_RTTI::getClassName() const
    {
        return m_className;
    }
    
-    bool RTTI::isExactly(const RTTI& rtti) const
+    bool SPINE_RTTI::isExactly(const SPINE_RTTI& rtti) const
    {
        return (this == &rtti);
    }
    
-    bool RTTI::derivesFrom(const RTTI& rtti) const
+    bool SPINE_RTTI::derivesFrom(const SPINE_RTTI& rtti) const
    {
-        const RTTI * pCompare = this;
+        const SPINE_RTTI * pCompare = this;
        
        while (pCompare)
        {
@ -63,7 +63,7 @@ namespace Spine
                return true;
            }
            
-            pCompare = pCompare->m_pBaseRTTI;
+            pCompare = pCompare->m_pBaseSPINE_RTTI;
        }
        
        return false;
--- a/spine-cpp/spine-cpp/src/spine/Timeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Timeline.cpp
@ -35,7 +35,7 @@

 namespace Spine
 {
-    RTTI_IMPL_NOPARENT(Timeline);
+    SPINE_RTTI_IMPL_NOPARENT(Timeline);
    
    Timeline::Timeline()
    {
--- a/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp
+++ b/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp
@ -39,7 +39,7 @@

 namespace Spine
 {
-    RTTI_IMPL(TransformConstraint, Constraint);
+    SPINE_RTTI_IMPL(TransformConstraint, Constraint);
    
    TransformConstraint::TransformConstraint(TransformConstraintData& data, Skeleton& skeleton) : Constraint(),
    _data(data),
--- a/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp
@ -32,6 +32,6 @@

 namespace Spine
 {
-    RTTI_IMPL(TransformConstraintTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(TransformConstraintTimeline, CurveTimeline);
 }

--- a/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp
@ -32,5 +32,5 @@

 namespace Spine
 {
-    RTTI_IMPL(TranslateTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(TranslateTimeline, CurveTimeline);
 }
--- a/spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp
+++ b/spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp
@ -32,5 +32,5 @@

 namespace Spine
 {
-    RTTI_IMPL(TwoColorTimeline, CurveTimeline);
+    SPINE_RTTI_IMPL(TwoColorTimeline, CurveTimeline);
 }
--- a/spine-cpp/spine-cpp/src/spine/Updatable.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Updatable.cpp
@ -32,7 +32,7 @@

 namespace Spine
 {
-    RTTI_IMPL_NOPARENT(Updatable);
+    SPINE_RTTI_IMPL_NOPARENT(Updatable);
    
    Updatable::Updatable()
    {
--- a/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp
+++ b/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp
@ -37,7 +37,7 @@

 namespace Spine
 {
-    RTTI_IMPL(VertexAttachment, Attachment);
+    SPINE_RTTI_IMPL(VertexAttachment, Attachment);
    
    VertexAttachment::VertexAttachment(std::string name) : Attachment(name), _worldVerticesLength(0), _id(getNextID())
    {