From d3783cba951c39277d53c76f1a1fb00476305161 Mon Sep 17 00:00:00 2001 From: pipu Date: Mon, 29 Dec 2014 17:04:23 +0800 Subject: [PATCH] Modify warning code. --- .../cocostudio/FlatBuffersSerialize.cpp | 10 +-- .../ArmatureNodeReader/ArmatureNodeReader.cpp | 6 +- .../ListViewReader/ListViewReader.cpp | 70 +++++++++---------- .../ProjectNodeReader/ProjectNodeReader.cpp | 10 +-- .../cocostudio/WidgetReader/WidgetReader.cpp | 2 +- 5 files changed, 49 insertions(+), 49 deletions(-) diff --git a/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp b/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp index 8397e5668c..a780c70bf4 100644 --- a/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp +++ b/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp @@ -1218,19 +1218,19 @@ Offset FlatBuffersSerialize::createProjectNodeOptionsForSimu if (name == "FileData") { - const tinyxml2::XMLAttribute* attribute = child->FirstAttribute(); + const tinyxml2::XMLAttribute* attributeFileData = child->FirstAttribute(); - while (attribute) + while (attributeFileData) { - name = attribute->Name(); - std::string value = attribute->Value(); + name = attributeFileData->Name(); + std::string value = attributeFileData->Value(); if (name == "Path") { filename = value; } - attribute = attribute->Next(); + attributeFileData = attributeFileData->Next(); } } diff --git a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp index 89a016417e..0a4bc3ed07 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp @@ -151,9 +151,9 @@ cocos2d::Node* ArmatureNodeReader::createNodeWithFlatBuffers(const flatbuffers: std::string ArmatureNodeReader::getArmatureName(const std::string& exporJsonPath) { //FileUtils.getFileData(exporJsonPath, "r", size) // need read armature name in exportJsonPath - int end = exporJsonPath.find_last_of("."); - int start = exporJsonPath.find_last_of("\\") + 1; - int start1 = exporJsonPath.find_last_of("/") + 1; + size_t end = exporJsonPath.find_last_of("."); + size_t start = exporJsonPath.find_last_of("\\") + 1; + size_t start1 = exporJsonPath.find_last_of("/") + 1; if (start < start1) start = start1; diff --git a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp index 4272f4b14a..e43ade4575 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp @@ -185,11 +185,11 @@ namespace cocostudio if (name == "InnerNodeSize") { - auto attribute = child->FirstAttribute(); - while (attribute) + auto attributeInnerNodeSize = child->FirstAttribute(); + while (attributeInnerNodeSize) { - name = attribute->Name(); - std::string value = attribute->Value(); + name = attributeInnerNodeSize->Name(); + std::string value = attributeInnerNodeSize->Value(); if (name == "Width") { @@ -200,17 +200,17 @@ namespace cocostudio innerSize.height = atof(value.c_str()); } - attribute = attribute->Next(); + attributeInnerNodeSize = attributeInnerNodeSize->Next(); } } else if (name == "Size" && backGroundScale9Enabled) { - auto attribute = child->FirstAttribute(); + auto attributeSize = child->FirstAttribute(); - while (attribute) + while (attributeSize) { - name = attribute->Name(); - std::string value = attribute->Value(); + name = attributeSize->Name(); + std::string value = attributeSize->Value(); if (name == "X") { @@ -221,17 +221,17 @@ namespace cocostudio scale9Size.height = atof(value.c_str()); } - attribute = attribute->Next(); + attributeSize = attributeSize->Next(); } } else if (name == "SingleColor") { - auto attribute = child->FirstAttribute(); + auto attributeSingleColor = child->FirstAttribute(); - while (attribute) + while (attributeSingleColor) { - name = attribute->Name(); - std::string value = attribute->Value(); + name = attributeSingleColor->Name(); + std::string value = attributeSingleColor->Value(); if (name == "R") { @@ -246,17 +246,17 @@ namespace cocostudio bgColor.b = atoi(value.c_str()); } - attribute = attribute->Next(); + attributeSingleColor = attributeSingleColor->Next(); } } else if (name == "EndColor") { - auto attribute = child->FirstAttribute(); + auto attributeEndColor = child->FirstAttribute(); - while (attribute) + while (attributeEndColor) { - name = attribute->Name(); - std::string value = attribute->Value(); + name = attributeEndColor->Name(); + std::string value = attributeEndColor->Value(); if (name == "R") { @@ -271,17 +271,17 @@ namespace cocostudio bgEndColor.b = atoi(value.c_str()); } - attribute = attribute->Next(); + attributeEndColor = attributeEndColor->Next(); } } else if (name == "FirstColor") { - auto attribute = child->FirstAttribute(); + auto attributeFirstColor = child->FirstAttribute(); - while (attribute) + while (attributeFirstColor) { - name = attribute->Name(); - std::string value = attribute->Value(); + name = attributeFirstColor->Name(); + std::string value = attributeFirstColor->Value(); if (name == "R") { @@ -296,16 +296,16 @@ namespace cocostudio bgStartColor.b = atoi(value.c_str()); } - attribute = attribute->Next(); + attributeFirstColor = attributeFirstColor->Next(); } } else if (name == "ColorVector") { - auto attribute = child->FirstAttribute(); - while (attribute) + auto attributeColorVector = child->FirstAttribute(); + while (attributeColorVector) { - name = attribute->Name(); - std::string value = attribute->Value(); + name = attributeColorVector->Name(); + std::string value = attributeColorVector->Value(); if (name == "ScaleX") { @@ -316,7 +316,7 @@ namespace cocostudio colorVector.y = atof(value.c_str()); } - attribute = attribute->Next(); + attributeColorVector = attributeColorVector->Next(); } } else if (name == "FileData") @@ -324,12 +324,12 @@ namespace cocostudio std::string texture; std::string texturePng; - auto attribute = child->FirstAttribute(); + auto attributeFileData = child->FirstAttribute(); - while (attribute) + while (attributeFileData) { - name = attribute->Name(); - std::string value = attribute->Value(); + name = attributeFileData->Name(); + std::string value = attributeFileData->Value(); if (name == "Path") { @@ -345,7 +345,7 @@ namespace cocostudio texture = value; } - attribute = attribute->Next(); + attributeFileData = attributeFileData->Next(); } if (resourceType == 1) diff --git a/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp index 23ff6f16b5..810f4d1f26 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp @@ -98,12 +98,12 @@ namespace cocostudio if (name == "FileData") { - const tinyxml2::XMLAttribute* attribute = child->FirstAttribute(); + const tinyxml2::XMLAttribute* attributeFileData = child->FirstAttribute(); - while (attribute) + while (attributeFileData) { - name = attribute->Name(); - std::string value = attribute->Value(); + name = attributeFileData->Name(); + std::string value = attributeFileData->Value(); if (name == "Path") { @@ -112,7 +112,7 @@ namespace cocostudio filename = convert; } - attribute = attribute->Next(); + attributeFileData = attributeFileData->Next(); } } diff --git a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp index 7e462d7033..211a0e918f 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp @@ -779,7 +779,7 @@ namespace cocostudio //assume versionString is like "2.0.6.0" if (versionString.length() > 0) { - int p1, p2, p3, v1, v2, v3; + size_t p1, p2, p3, v1, v2, v3; p1 = p2 = p3 = v1 = v2 = v3 = 0; p1 = versionString.find('.'); if (p1 > 0)