diff --git a/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp b/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp index f195bd47c..1a31f5e32 100644 --- a/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp +++ b/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp @@ -48,7 +48,7 @@ namespace spine { AtlasAttachmentLoader::AtlasAttachmentLoader(Atlas *atlas) : AttachmentLoader(), _atlas(atlas) { } - bool loadSequence (Atlas *atlas, const String &basePath, Sequence *sequence) { + bool loadSequence(Atlas *atlas, const String &basePath, Sequence *sequence) { Vector ®ions = sequence->getRegions(); for (int i = 0, n = regions.size(); i < n; i++) { String path = sequence->getPath(basePath, i); @@ -61,7 +61,7 @@ namespace spine { RegionAttachment *AtlasAttachmentLoader::newRegionAttachment(Skin &skin, const String &name, const String &path, Sequence *sequence) { SP_UNUSED(skin); - RegionAttachment *attachment = new(__FILE__, __LINE__) RegionAttachment(name); + RegionAttachment *attachment = new (__FILE__, __LINE__) RegionAttachment(name); if (sequence) { if (!loadSequence(_atlas, path, sequence)) return NULL; } else { diff --git a/spine-cpp/spine-cpp/src/spine/Sequence.cpp b/spine-cpp/spine-cpp/src/spine/Sequence.cpp index 77794d49a..ec5b79c50 100644 --- a/spine-cpp/spine-cpp/src/spine/Sequence.cpp +++ b/spine-cpp/spine-cpp/src/spine/Sequence.cpp @@ -40,11 +40,9 @@ Sequence::Sequence() : _id(Sequence::getNextID()), _start(0), _digits(0), _setupIndex(0) { - } Sequence::~Sequence() { - } Sequence *Sequence::copy() { @@ -61,7 +59,7 @@ Sequence *Sequence::copy() { void Sequence::apply(Slot *slot, Attachment *attachment) { int index = slot->getSequenceIndex(); if (index == -1) index = _setupIndex; - if (index >= (int)_regions.size()) index = _regions.size() - 1; + if (index >= (int) _regions.size()) index = _regions.size() - 1; TextureRegion *region = _regions[index]; if (attachment->getRTTI().isExactly(RegionAttachment::rtti)) { diff --git a/spine-cpp/spine-cpp/src/spine/Slot.cpp b/spine-cpp/spine-cpp/src/spine/Slot.cpp index d9c08bf80..1918c4981 100644 --- a/spine-cpp/spine-cpp/src/spine/Slot.cpp +++ b/spine-cpp/spine-cpp/src/spine/Slot.cpp @@ -103,8 +103,8 @@ void Slot::setAttachment(Attachment *inValue) { !_attachment || !inValue->getRTTI().instanceOf(VertexAttachment::rtti) || !_attachment->getRTTI().instanceOf(VertexAttachment::rtti) || - static_cast(inValue)->getTimelineAttachment() != - static_cast(_attachment)->getTimelineAttachment()) { + static_cast(inValue)->getTimelineAttachment() != + static_cast(_attachment)->getTimelineAttachment()) { _deform.clear(); } diff --git a/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp b/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp index d2570e49e..c8898663f 100644 --- a/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp @@ -150,7 +150,7 @@ void VertexAttachment::setWorldVerticesLength(size_t inValue) { _worldVerticesLength = inValue; } -Attachment * VertexAttachment::getTimelineAttachment() { +Attachment *VertexAttachment::getTimelineAttachment() { return _timelineAttachment; }