change ‘auto’ to ‘auto&&’

AMPedGames · Jul 16, 2015 · d5d5af5 · d5d5af5
1 parent 1c9a181
commit d5d5af5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp
@@ -342,7 +342,7 @@ Label::Label(TextHAlignment hAlignment /* = TextHAlignment::LEFT */,
     _purgeTextureListener = EventListenerCustom::create(FontAtlas::CMD_PURGE_FONTATLAS, [this](EventCustom* event){
         if (_fontAtlas && _currentLabelType == LabelType::TTF && event->getUserData() == _fontAtlas)
         {
-            for (auto it : _letters)
+            for (auto&& it : _letters)
             {
                 it.second->setTexture(nullptr);
             }
@@ -361,7 +361,7 @@ Label::Label(TextHAlignment hAlignment /* = TextHAlignment::LEFT */,
         {
             _fontAtlas = nullptr;
             this->setTTFConfig(_fontConfig);
-            for (auto it : _letters)
+            for (auto&& it : _letters)
             {
                 getLetter(it.first);
             }
@@ -756,7 +756,7 @@ void Label::alignText()
         }
     }
 
-    for (const auto& batchNode : _batchNodes)
+    for (auto&& batchNode : _batchNodes)
     {
         batchNode->getTextureAtlas()->removeAllQuads();
     }
@@ -1157,11 +1157,11 @@ void Label::onDrawShadow(GLProgram* glProgram)
         }
 
         glProgram->setUniformsForBuiltins(_shadowTransform);
-        for (auto it : _letters)
+        for (auto&& it : _letters)
         {
             it.second->updateTransform();
         }
-        for (const auto& batchNode : _batchNodes)
+        for (auto&& batchNode : _batchNodes)
         {
             batchNode->getTextureAtlas()->drawQuads();
         }
@@ -1174,11 +1174,11 @@ void Label::onDrawShadow(GLProgram* glProgram)
         setColor(_shadowColor3B);
 
         glProgram->setUniformsForBuiltins(_shadowTransform);
-        for (auto it : _letters)
+        for (auto&& it : _letters)
         {
             it.second->updateTransform();
         }
-        for (const auto& batchNode : _batchNodes)
+        for (auto&& batchNode : _batchNodes)
         {
             batchNode->getTextureAtlas()->drawQuads();
         }
@@ -1200,7 +1200,7 @@ void Label::onDraw(const Mat4& transform, bool transformUpdated)
     }
 
     glprogram->setUniformsForBuiltins(transform);
-    for (auto it : _letters)
+    for (auto&& it : _letters)
     {
         it.second->updateTransform();
     }
@@ -1214,7 +1214,7 @@ void Label::onDraw(const Mat4& transform, bool transformUpdated)
                 _textColorF.r, _textColorF.g, _textColorF.b, _textColorF.a);
             glprogram->setUniformLocationWith4f(_uniformEffectColor,
                 _effectColorF.r, _effectColorF.g, _effectColorF.b, _effectColorF.a);
-            for (const auto& batchNode : _batchNodes)
+            for (auto&& batchNode : _batchNodes)
             {
                 batchNode->getTextureAtlas()->drawQuads();
             }
@@ -1235,7 +1235,7 @@ void Label::onDraw(const Mat4& transform, bool transformUpdated)
         }
     }
 
-    for (const auto& batchNode : _batchNodes)
+    for (auto&& batchNode : _batchNodes)
     {
         batchNode->getTextureAtlas()->drawQuads();
     }
@@ -1526,7 +1526,7 @@ void Label::updateDisplayedColor(const Color3B& parentColor)
         }
     }
 
-    for (auto it : _letters)
+    for (auto&& it : _letters)
     {
         it.second->updateDisplayedColor(_displayedColor);;
     }
@@ -1545,7 +1545,7 @@ void Label::updateDisplayedOpacity(GLubyte parentOpacity)
         }
     }
 
-    for (auto it : _letters)
+    for (auto&& it : _letters)
     {
         it.second->updateDisplayedOpacity(_displayedOpacity);;
     }
@@ -1586,7 +1586,7 @@ void Label::updateColor()
 
     cocos2d::TextureAtlas* textureAtlas;
     V3F_C4B_T2F_Quad *quads;
-    for (const auto& batchNode:_batchNodes)
+    for (auto&& batchNode:_batchNodes)
     {
         textureAtlas = batchNode->getTextureAtlas();
         quads = textureAtlas->getQuads();
@@ -1649,7 +1649,7 @@ void Label::removeAllChildrenWithCleanup(bool cleanup)
 void Label::removeChild(Node* child, bool cleanup /* = true */)
 {
     Node::removeChild(child, cleanup);
-    for (auto it : _letters)
+    for (auto&& it : _letters)
     {
         if (it.second == child)
         {

diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
@@ -1555,7 +1555,7 @@ void LabelAlignmentTest::setAlignmentBottom(Ref* sender)
     _label->setString(getCurrentAlignment());
 }
 
-const char* LabelAlignmentTest::getCurrentAlignment()
+std::string LabelAlignmentTest::getCurrentAlignment()
 {
     const char* vertical = nullptr;
     const char* horizontal = nullptr;
@@ -1582,7 +1582,7 @@ const char* LabelAlignmentTest::getCurrentAlignment()
         break;
     }
 
-    return StringUtils::format("Alignment %s %s", vertical, horizontal).c_str();
+    return StringUtils::format("Alignment %s %s", vertical, horizontal);
 }
 
 std::string LabelAlignmentTest::title() const

diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
@@ -427,7 +427,7 @@ class LabelAlignmentTest : public AtlasDemoNew
     void  setAlignmentTop(cocos2d::Ref* sender);
     void  setAlignmentMiddle(cocos2d::Ref* sender);
     void  setAlignmentBottom(cocos2d::Ref* sender);
-    const char* getCurrentAlignment();
+    std::string getCurrentAlignment();
 
     cocos2d::Label* _label;
     cocos2d::TextHAlignment _horizAlign;