add new clang-tidy option (#19699)

JohnCoconut · minggo · commit be3b7a2154ae · 2019-05-15T18:27:54.000-07:00
* readability-redundant-string-cstr
diff --git a/.clang-tidy b/.clang-tidy
@@ -11,6 +11,7 @@ Checks: >
   readability-container-size-empty,
   readability-delete-null-pointer,
   readability-redundant-control-flow,
+  readability-redundant-string-cstr,
 
 WarningsAsErrors: '*'
 HeaderFilterRegex: '/(?!external)/.*'
diff --git a/cocos/audio/linux/SimpleAudioEngine.cpp b/cocos/audio/linux/SimpleAudioEngine.cpp
@@ -84,7 +84,7 @@ void SimpleAudioEngine::stopBackgroundMusic(bool releaseData)
 {
     AudioEngine::stop(g_SimpleAudioEngineLinux->musicid);
     if (releaseData) {
-        AudioEngine::uncache(g_SimpleAudioEngineLinux->musicpath.c_str());
+        AudioEngine::uncache(g_SimpleAudioEngineLinux->musicpath);
     }
 }
 
diff --git a/cocos/base/CCDataVisitor.cpp b/cocos/base/CCDataVisitor.cpp
@@ -203,7 +203,7 @@ void PrettyPrinter::visit(const __Set *p)
         if (i > 0) {
             _result += "\n";
         }
-        _result += _indentStr.c_str();
+        _result += _indentStr;
         PrettyPrinter v(_indentLevel);
 //FIXME:james        (*it)->acceptVisitor(v);
         _result += v.getResult();
diff --git a/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp b/cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp
@@ -577,7 +577,7 @@ Offset<NodeAction> FlatBuffersSerialize::createNodeAction(const tinyxml2::XMLEle
         }
         else if (name == "ActivedAnimationName")
         {
-            currentAnimationName = value.c_str();
+            currentAnimationName = value;
         }
         
         attribute = attribute->Next();
diff --git a/cocos/network/SocketIO.cpp b/cocos/network/SocketIO.cpp
@@ -720,7 +720,7 @@ void SIOClientImpl::send(SocketIOPacket *packet)
     if (_connected)
     {
         CCLOGINFO("-->SEND:%s", req.data());
-        _ws->send(req.data());
+        _ws->send(req);
     }
     else
         CCLOGINFO("Cant send the message (%s) because disconnected", req.c_str());
@@ -757,7 +757,7 @@ void SIOClientImpl::onOpen(WebSocket* /*ws*/)
     if (_version == SocketIOPacket::SocketIOVersion::V10x)
     {
         std::string s = "5";//That's a ping https://github.com/Automattic/engine.io-parser/blob/1b8e077b2218f4947a69f5ad18be2a512ed54e93/lib/index.js#L21
-        _ws->send(s.data());
+        _ws->send(s);
     }
 
     Director::getInstance()->getScheduler()->schedule(CC_SCHEDULE_SELECTOR(SIOClientImpl::heartbeat), this, (_heartbeat * .9f), false);
diff --git a/cocos/platform/linux/CCDevice-linux.cpp b/cocos/platform/linux/CCDevice-linux.cpp
@@ -349,7 +349,7 @@ class BitmapDC
         std::string lowerCasePath = fontPath;
         std::transform(lowerCasePath.begin(), lowerCasePath.end(), lowerCasePath.begin(), ::tolower);
         if ( lowerCasePath.find(".ttf") != std::string::npos ) {
-            fontPath = cocos2d::FileUtils::getInstance()->fullPathForFilename(fontPath.c_str());
+            fontPath = cocos2d::FileUtils::getInstance()->fullPathForFilename(fontPath);
 
             FILE *f = fopen(fontPath.c_str(), "r");
             if ( f ) {
diff --git a/cocos/scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.cpp b/cocos/scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.cpp
@@ -239,7 +239,7 @@ bool jsval_to_TerrainData(JSContext* cx, JS::HandleValue v, Terrain::TerrainData
         JS::ToNumber(cx, js_mapHeight, &mapHeight);
     JSB_PRECONDITION2(ok, cx, false, "Error processing arguments");
 
-    ret->_heightMapSrc = heightMap.c_str();
+    ret->_heightMapSrc = heightMap;
     char* tmp = (char*)malloc(sizeof(char) * (alphaMap.size() + 1));
     strcpy(tmp, alphaMap.c_str());
     tmp[alphaMap.size()] = '\0';
diff --git a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp
@@ -801,7 +801,7 @@ int LuaStack::luaLoadChunksFromZIP(lua_State *L)
             std::string filename = zip->getFirstFilename();
             while (filename.length()) {
                 ssize_t bufferSize = 0;
-                unsigned char *zbuffer = zip->getFileData(filename.c_str(), &bufferSize);
+                unsigned char *zbuffer = zip->getFileData(filename, &bufferSize);
                 if (bufferSize) {
                     // remove .lua or .luac extension
                     size_t pos = filename.find_last_of('.');
diff --git a/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp
@@ -3779,7 +3779,7 @@ static int tolua_cocos2dx_FileUtils_getStringFromFile(lua_State* tolua_S)
         if (ok)
         {
             std::string fullPathName = FileUtils::getInstance()->fullPathForFilename(arg0);
-            __String* contentsOfFile = __String::createWithContentsOfFile(fullPathName.c_str());
+            __String* contentsOfFile = __String::createWithContentsOfFile(fullPathName);
             if (nullptr != contentsOfFile)
             {
                 const char* tolua_ret = contentsOfFile->getCString();
diff --git a/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.cpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.cpp
@@ -135,7 +135,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getScene(lua_State* tolua_S)
             auto iter = g_luaType.find(hashName);
             std::string className = "";
             if(iter != g_luaType.end()){
-                className = iter->second.c_str();
+                className = iter->second;
             } else {
                 className = "cc.Scene";
             }
diff --git a/extensions/assets-manager/AssetsManager.cpp b/extensions/assets-manager/AssetsManager.cpp
@@ -226,7 +226,7 @@ void AssetsManager::downloadAndUncompress()
             Director::getInstance()->getScheduler()->performFunctionInCocosThread([&, this] {
                 
                 // Record new version code.
-                UserDefault::getInstance()->setStringForKey(this->keyOfVersion().c_str(), this->_version.c_str());
+                UserDefault::getInstance()->setStringForKey(this->keyOfVersion().c_str(), this->_version);
                 
                 // Unrecord downloaded version code.
                 UserDefault::getInstance()->setStringForKey(this->keyOfDownloadedVersion().c_str(), "");
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Box2dView.cpp b/tests/cpp-tests/Classes/Box2DTestBed/Box2dView.cpp
@@ -92,7 +92,7 @@ bool Box2dTestBed::initWithEntryID(int entryId)
     view->setScale(15);
     view->setAnchorPoint( Vec2(0,0) );
     view->setPosition(visibleOrigin.x+visibleSize.width/2, visibleOrigin.y+visibleSize.height/3);
-    auto label = Label::createWithTTF(view->title().c_str(), "fonts/arial.ttf", 28);
+    auto label = Label::createWithTTF(view->title(), "fonts/arial.ttf", 28);
     addChild(label, 1);
     label->setPosition(visibleOrigin.x+visibleSize.width/2, visibleOrigin.y+visibleSize.height-50);
     
diff --git a/tests/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.cpp b/tests/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.cpp
@@ -69,14 +69,14 @@ void PrettyPrinterDemo::onEnter()
     TestCase::onEnter();
     auto s = Director::getInstance()->getWinSize();
     
-    auto label = Label::createWithTTF(title().c_str(), "fonts/arial.ttf", 28);
+    auto label = Label::createWithTTF(title(), "fonts/arial.ttf", 28);
     label->setPosition(s.width/2, s.height * 4/5);
     this->addChild(label, 1);
     
     std::string strSubtitle = subtitle();
     if(strSubtitle.empty() == false)
     {
-        auto subLabel = Label::createWithTTF(strSubtitle.c_str(), "fonts/Thonburi.ttf", 16);
+        auto subLabel = Label::createWithTTF(strSubtitle, "fonts/Thonburi.ttf", 16);
         subLabel->setPosition(s.width/2, s.height * 3/5);
         this->addChild(subLabel, 1);
     }
diff --git a/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp
@@ -120,7 +120,7 @@ void SocketIOTest::testevent(SIOClient *client, const std::string& data) {
 	std::stringstream s;
 	s << client->getTag() << " received event testevent with data: " << data.c_str();
 
-	_sioClientStatus->setString(s.str().c_str());
+	_sioClientStatus->setString(s.str());
 
 }
 
@@ -131,7 +131,7 @@ void SocketIOTest::echotest(SIOClient *client, const std::string& data) {
 	std::stringstream s;
 	s << client->getTag() << " received event echotest with data: " << data.c_str();
 
-	_sioClientStatus->setString(s.str().c_str());
+	_sioClientStatus->setString(s.str());
 
 }
 
@@ -143,7 +143,7 @@ void SocketIOTest::message(network::SIOClient* client, const std::string& data)
 
 	std::stringstream s;
 	s << client->getTag() << " received message with content: " << data.c_str();
-	_sioClientStatus->setString(s.str().c_str());
+	_sioClientStatus->setString(s.str());
 
 }
 
@@ -153,7 +153,7 @@ void SocketIOTest::json(network::SIOClient* client, const std::string& data)
 
 	std::stringstream s;
 	s << client->getTag() << " received json message with content: " << data.c_str();
-	_sioClientStatus->setString(s.str().c_str());
+	_sioClientStatus->setString(s.str());
 
 }
 
@@ -163,7 +163,7 @@ void SocketIOTest::connect(network::SIOClient* client, const std::string& data)
 
 	std::stringstream s;
 	s << client->getTag() << " connected!";
-	_sioClientStatus->setString(s.str().c_str());
+	_sioClientStatus->setString(s.str());
 
 }
 
@@ -173,7 +173,7 @@ void SocketIOTest::disconnect(network::SIOClient* client, const std::string& dat
 
 	std::stringstream s;
 	s << client->getTag() << " disconnected by server!";
-	_sioClientStatus->setString(s.str().c_str());
+	_sioClientStatus->setString(s.str());
 
 	this->closedSocketAction(client);
 
@@ -271,7 +271,7 @@ void SocketIOTest::onMenuTestClientDisconnectClicked(cocos2d::Ref *sender)
 		s << "Socket.io Test Client not initialized!";
 	}
 
-	_sioClientStatus->setString(s.str().c_str());
+	_sioClientStatus->setString(s.str());
 
 }
 
@@ -288,7 +288,7 @@ void SocketIOTest::onMenuTestEndpointDisconnectClicked(cocos2d::Ref *sender)
 		s << "Socket.io Test Endpoint not initialized!";
 	}
 
-	_sioClientStatus->setString(s.str().c_str());
+	_sioClientStatus->setString(s.str());
 
 }
 
@@ -300,7 +300,7 @@ void SocketIOTest::onClose(network::SIOClient* client)
 
 	std::stringstream s;
 	s << client->getTag() << " closed!";
-	_sioClientStatus->setString(s.str().c_str());
+	_sioClientStatus->setString(s.str());
 
 	this->closedSocketAction(client);
 
@@ -312,5 +312,5 @@ void SocketIOTest::onError(network::SIOClient* client, const std::string& data)
 
 	std::stringstream s;
 	s << client->getTag() << " received error with content: " << data.c_str();
-	_sioClientStatus->setString(s.str().c_str());
+	_sioClientStatus->setString(s.str());
 }
diff --git a/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketDelayTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketDelayTest.cpp
@@ -213,6 +213,6 @@ void WebSocketDelayTest::onMenuSendTextClicked(cocos2d::Ref *sender)
     {
         std::string warningStr = "send text websocket instance wasn't ready...";
         log("%s", warningStr.c_str());
-        _sendTextStatus->setString(warningStr.c_str());
+        _sendTextStatus->setString(warningStr);
     }
 }
diff --git a/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp
@@ -197,7 +197,7 @@ void WebSocketTest::onMessage(network::WebSocket* ws, const network::WebSocket::
         std::string textStr = std::string("response text msg: ")+data.bytes+", "+times;
         log("%s", textStr.c_str());
         
-        _sendTextStatus->setString(textStr.c_str());
+        _sendTextStatus->setString(textStr);
     }
     else
     {
@@ -220,7 +220,7 @@ void WebSocketTest::onMessage(network::WebSocket* ws, const network::WebSocket::
         
         binaryStr += std::string(", ")+times;
         log("%s", binaryStr.c_str());
-        _sendBinaryStatus->setString(binaryStr.c_str());
+        _sendBinaryStatus->setString(binaryStr);
     }
 }
 
@@ -285,7 +285,7 @@ void WebSocketTest::onMenuSendTextClicked(cocos2d::Ref *sender)
     {
         std::string warningStr = "send text websocket instance wasn't ready...";
         log("%s", warningStr.c_str());
-        _sendTextStatus->setString(warningStr.c_str());
+        _sendTextStatus->setString(warningStr);
     }
 }
 
@@ -307,7 +307,7 @@ void WebSocketTest::onMenuSendMultipleTextClicked(cocos2d::Ref *sender)
     {
         std::string warningStr = "send text websocket instance wasn't ready...";
         log("%s", warningStr.c_str());
-        _sendTextStatus->setString(warningStr.c_str());
+        _sendTextStatus->setString(warningStr);
     }
 }
 
@@ -327,7 +327,7 @@ void WebSocketTest::onMenuSendBinaryClicked(cocos2d::Ref *sender)
     {
         std::string warningStr = "send binary websocket instance wasn't ready...";
         log("%s", warningStr.c_str());
-        _sendBinaryStatus->setString(warningStr.c_str());
+        _sendBinaryStatus->setString(warningStr);
     }
 }
 
diff --git a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp
@@ -563,7 +563,7 @@ void TextWritePlist::onEnter()
     else
         log("write plist file failed");
 
-    auto label = Label::createWithTTF(fullPath.c_str(), "fonts/Thonburi.ttf", 6);
+    auto label = Label::createWithTTF(fullPath, "fonts/Thonburi.ttf", 6);
     this->addChild(label);
     auto winSize = Director::getInstance()->getWinSize();
     label->setPosition(winSize.width/2, winSize.height/3);
@@ -593,7 +593,7 @@ std::string TextWritePlist::title() const
 
 std::string TextWritePlist::subtitle() const
 {
-    std::string writablePath = FileUtils::getInstance()->getWritablePath().c_str();
+    std::string writablePath = FileUtils::getInstance()->getWritablePath();
     return ("See plist file at your writablePath");
 }
 
@@ -617,7 +617,7 @@ void TestWriteString::onEnter()
     // writeTest
     std::string writeDataStr = "the string data will be write into a file";
     std::string fullPath = writablePath + fileName;
-    if (FileUtils::getInstance()->writeStringToFile(writeDataStr, fullPath.c_str()))
+    if (FileUtils::getInstance()->writeStringToFile(writeDataStr, fullPath))
     {
         log("see the plist file at %s", fullPath.c_str());
         writeResult->setString("write success:" + writeDataStr);
@@ -793,7 +793,7 @@ void TestWriteData::onEnter()
     Data writeData;
     writeData.copy((unsigned char *)writeDataStr.c_str(), writeDataStr.size());
     std::string fullPath = writablePath + fileName;
-    if (FileUtils::getInstance()->writeDataToFile(writeData, fullPath.c_str()))
+    if (FileUtils::getInstance()->writeDataToFile(writeData, fullPath))
     {
         log("see the plist file at %s", fullPath.c_str());
         writeResult->setString("write success:" + writeDataStr);
@@ -881,7 +881,7 @@ void TestWriteValueMap::onEnter()
     // end with /
     std::string writablePath = FileUtils::getInstance()->getWritablePath();
     std::string fullPath = writablePath + "testWriteValueMap.plist";
-    if (FileUtils::getInstance()->writeValueMapToFile(valueMap, fullPath.c_str()))
+    if (FileUtils::getInstance()->writeValueMapToFile(valueMap, fullPath))
     {
         log("see the plist file at %s", fullPath.c_str());
         writeResult->setString("write success");
@@ -892,7 +892,7 @@ void TestWriteValueMap::onEnter()
         writeResult->setString("write failed");
     }
 
-    ValueMap readValueMap = FileUtils::getInstance()->getValueMapFromFile(fullPath.c_str());
+    ValueMap readValueMap = FileUtils::getInstance()->getValueMapFromFile(fullPath);
     std::string readDataStr = "read data:\n";
     // read value map data
     ValueMap readMapInMap = readValueMap["data0"].asValueMap();
@@ -984,7 +984,7 @@ void TestWriteValueVector::onEnter()
     // end with /
     std::string writablePath = FileUtils::getInstance()->getWritablePath();
     std::string fullPath = writablePath + "testWriteValueVector.plist";
-    if (FileUtils::getInstance()->writeValueVectorToFile(array, fullPath.c_str()))
+    if (FileUtils::getInstance()->writeValueVectorToFile(array, fullPath))
     {
         log("see the plist file at %s", fullPath.c_str());
         writeResult->setString("write success");
@@ -995,7 +995,7 @@ void TestWriteValueVector::onEnter()
         writeResult->setString("write failed");
     }
 
-    ValueVector readArray = FileUtils::getInstance()->getValueVectorFromFile(fullPath.c_str());
+    ValueVector readArray = FileUtils::getInstance()->getValueVectorFromFile(fullPath);
     std::string readDataStr = "read data:\n";
     // read value map data
     ValueMap readMapInArray = readArray.at(0).asValueMap();
diff --git a/tests/cpp-tests/Classes/InputTest/MouseTest.cpp b/tests/cpp-tests/Classes/InputTest/MouseTest.cpp
@@ -74,31 +74,31 @@ void MouseEventTest::onMouseDown(Event *event)
     EventMouse* e = (EventMouse*)event;
     std::string str = "Mouse Down detected, Key: ";
     str += tostr(static_cast<int>(e->getMouseButton()));
-    _labelAction->setString(str.c_str());
+    _labelAction->setString(str);
 }
 
 void MouseEventTest::onMouseUp(Event *event)
 {
     EventMouse* e = (EventMouse*)event;
     std::string str = "Mouse Up detected, Key: ";
     str += tostr(static_cast<int>(e->getMouseButton()));
-    _labelAction->setString(str.c_str());
+    _labelAction->setString(str);
 }
 
 void MouseEventTest::onMouseMove(Event *event)
 {
     EventMouse* e = (EventMouse*)event;
     std::string str = "MousePosition X:";
     str = str + tostr(e->getCursorX()) + " Y:" + tostr(e->getCursorY());
-    _labelPosition->setString(str.c_str());
+    _labelPosition->setString(str);
 }
 
 void MouseEventTest::onMouseScroll(Event *event)
 {
     EventMouse* e = (EventMouse*)event;
     std::string str = "Mouse Scroll detected, X: ";
     str = str + tostr(e->getScrollX()) + " Y: " + tostr(e->getScrollY());
-    _labelAction->setString(str.c_str());
+    _labelAction->setString(str);
 }
 
 std::string MouseEventTest::title() const
diff --git a/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp b/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp
@@ -392,7 +392,7 @@ void CustomEventTest::onEnter()
         char* buf = static_cast<char*>(event->getUserData());
         str += buf;
         str += " times";
-        statusLabel->setString(str.c_str());
+        statusLabel->setString(str);
     });
     
     _eventDispatcher->addEventListenerWithFixedPriority(_listener, 1);
@@ -418,7 +418,7 @@ void CustomEventTest::onEnter()
         char* buf = static_cast<char*>(event->getUserData());
         str += buf;
         str += " times";
-        statusLabel2->setString(str.c_str());
+        statusLabel2->setString(str);
     });
     
     _eventDispatcher->addEventListenerWithFixedPriority(_listener2, 1);
diff --git a/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp b/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp
diff --git a/tests/cpp-tests/Classes/TileMapTest/TileMapTest.cpp b/tests/cpp-tests/Classes/TileMapTest/TileMapTest.cpp
diff --git a/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp b/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void SimpleAudioEngine::stopBackgroundMusic(bool releaseData)`
`84`	`84`	`{`
`85`	`85`	`AudioEngine::stop(g_SimpleAudioEngineLinux->musicid);`
`86`	`86`	`if (releaseData) {`
`87`		`- AudioEngine::uncache(g_SimpleAudioEngineLinux->musicpath.c_str());`
	`87`	`+ AudioEngine::uncache(g_SimpleAudioEngineLinux->musicpath);`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ void PrettyPrinter::visit(const __Set *p)`
`203`	`203`	`if (i > 0) {`
`204`	`204`	`_result += "\n";`
`205`	`205`	`}`
`206`		`- _result += _indentStr.c_str();`
	`206`	`+ _result += _indentStr;`
`207`	`207`	`PrettyPrinter v(_indentLevel);`
`208`	`208`	`//FIXME:james (*it)->acceptVisitor(v);`
`209`	`209`	`_result += v.getResult();`
Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ Offset<NodeAction> FlatBuffersSerialize::createNodeAction(const tinyxml2::XMLEle`
`577`	`577`	`}`
`578`	`578`	`else if (name == "ActivedAnimationName")`
`579`	`579`	`{`
`580`		`- currentAnimationName = value.c_str();`
	`580`	`+ currentAnimationName = value;`
`581`	`581`	`}`
`582`	`582`
`583`	`583`	`attribute = attribute->Next();`
Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,7 @@ void SIOClientImpl::send(SocketIOPacket *packet)`
`720`	`720`	`if (_connected)`
`721`	`721`	`{`
`722`	`722`	`CCLOGINFO("-->SEND:%s", req.data());`
`723`		`- _ws->send(req.data());`
	`723`	`+ _ws->send(req);`
`724`	`724`	`}`
`725`	`725`	`else`
`726`	`726`	`CCLOGINFO("Cant send the message (%s) because disconnected", req.c_str());`
`@@ -757,7 +757,7 @@ void SIOClientImpl::onOpen(WebSocket* /ws/)`
`757`	`757`	`if (_version == SocketIOPacket::SocketIOVersion::V10x)`
`758`	`758`	`{`
`759`	`759`	`std::string s = "5";//That's a ping https://github.com/Automattic/engine.io-parser/blob/1b8e077b2218f4947a69f5ad18be2a512ed54e93/lib/index.js#L21`
`760`		`- _ws->send(s.data());`
	`760`	`+ _ws->send(s);`
`761`	`761`	`}`
`762`	`762`
`763`	`763`	`Director::getInstance()->getScheduler()->schedule(CC_SCHEDULE_SELECTOR(SIOClientImpl::heartbeat), this, (_heartbeat * .9f), false);`
Original file line number	Diff line number	Diff line change
`@@ -3779,7 +3779,7 @@ static int tolua_cocos2dx_FileUtils_getStringFromFile(lua_State* tolua_S)`
`3779`	`3779`	`if (ok)`
`3780`	`3780`	`{`
`3781`	`3781`	`std::string fullPathName = FileUtils::getInstance()->fullPathForFilename(arg0);`
`3782`		`- __String* contentsOfFile = __String::createWithContentsOfFile(fullPathName.c_str());`
	`3782`	`+ __String* contentsOfFile = __String::createWithContentsOfFile(fullPathName);`
`3783`	`3783`	`if (nullptr != contentsOfFile)`
`3784`	`3784`	`{`
`3785`	`3785`	`const char* tolua_ret = contentsOfFile->getCString();`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ int lua_cocos2dx_physics_PhysicsWorld_getScene(lua_State* tolua_S)`
`135`	`135`	`auto iter = g_luaType.find(hashName);`
`136`	`136`	`std::string className = "";`
`137`	`137`	`if(iter != g_luaType.end()){`
`138`		`- className = iter->second.c_str();`
	`138`	`+ className = iter->second;`
`139`	`139`	`} else {`
`140`	`140`	`className = "cc.Scene";`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ void SocketIOTest::testevent(SIOClient *client, const std::string& data) {`
`120`	`120`	`std::stringstream s;`
`121`	`121`	`s << client->getTag() << " received event testevent with data: " << data.c_str();`
`122`	`122`
`123`		`- _sioClientStatus->setString(s.str().c_str());`
	`123`	`+ _sioClientStatus->setString(s.str());`
`124`	`124`
`125`	`125`	`}`
`126`	`126`
`@@ -131,7 +131,7 @@ void SocketIOTest::echotest(SIOClient *client, const std::string& data) {`
`131`	`131`	`std::stringstream s;`
`132`	`132`	`s << client->getTag() << " received event echotest with data: " << data.c_str();`
`133`	`133`
`134`		`- _sioClientStatus->setString(s.str().c_str());`
	`134`	`+ _sioClientStatus->setString(s.str());`
`135`	`135`
`136`	`136`	`}`
`137`	`137`
`@@ -143,7 +143,7 @@ void SocketIOTest::message(network::SIOClient* client, const std::string& data)`
`143`	`143`
`144`	`144`	`std::stringstream s;`
`145`	`145`	`s << client->getTag() << " received message with content: " << data.c_str();`
`146`		`- _sioClientStatus->setString(s.str().c_str());`
	`146`	`+ _sioClientStatus->setString(s.str());`
`147`	`147`
`148`	`148`	`}`
`149`	`149`
`@@ -153,7 +153,7 @@ void SocketIOTest::json(network::SIOClient* client, const std::string& data)`
`153`	`153`
`154`	`154`	`std::stringstream s;`
`155`	`155`	`s << client->getTag() << " received json message with content: " << data.c_str();`
`156`		`- _sioClientStatus->setString(s.str().c_str());`
	`156`	`+ _sioClientStatus->setString(s.str());`
`157`	`157`
`158`	`158`	`}`
`159`	`159`
`@@ -163,7 +163,7 @@ void SocketIOTest::connect(network::SIOClient* client, const std::string& data)`
`163`	`163`
`164`	`164`	`std::stringstream s;`
`165`	`165`	`s << client->getTag() << " connected!";`
`166`		`- _sioClientStatus->setString(s.str().c_str());`
	`166`	`+ _sioClientStatus->setString(s.str());`
`167`	`167`
`168`	`168`	`}`
`169`	`169`
`@@ -173,7 +173,7 @@ void SocketIOTest::disconnect(network::SIOClient* client, const std::string& dat`
`173`	`173`
`174`	`174`	`std::stringstream s;`
`175`	`175`	`s << client->getTag() << " disconnected by server!";`
`176`		`- _sioClientStatus->setString(s.str().c_str());`
	`176`	`+ _sioClientStatus->setString(s.str());`
`177`	`177`
`178`	`178`	`this->closedSocketAction(client);`
`179`	`179`
`@@ -271,7 +271,7 @@ void SocketIOTest::onMenuTestClientDisconnectClicked(cocos2d::Ref *sender)`
`271`	`271`	`s << "Socket.io Test Client not initialized!";`
`272`	`272`	`}`
`273`	`273`
`274`		`- _sioClientStatus->setString(s.str().c_str());`
	`274`	`+ _sioClientStatus->setString(s.str());`
`275`	`275`
`276`	`276`	`}`
`277`	`277`
`@@ -288,7 +288,7 @@ void SocketIOTest::onMenuTestEndpointDisconnectClicked(cocos2d::Ref *sender)`
`288`	`288`	`s << "Socket.io Test Endpoint not initialized!";`
`289`	`289`	`}`
`290`	`290`
`291`		`- _sioClientStatus->setString(s.str().c_str());`
	`291`	`+ _sioClientStatus->setString(s.str());`
`292`	`292`
`293`	`293`	`}`
`294`	`294`
`@@ -300,7 +300,7 @@ void SocketIOTest::onClose(network::SIOClient* client)`
`300`	`300`
`301`	`301`	`std::stringstream s;`
`302`	`302`	`s << client->getTag() << " closed!";`
`303`		`- _sioClientStatus->setString(s.str().c_str());`
	`303`	`+ _sioClientStatus->setString(s.str());`
`304`	`304`
`305`	`305`	`this->closedSocketAction(client);`
`306`	`306`
`@@ -312,5 +312,5 @@ void SocketIOTest::onError(network::SIOClient* client, const std::string& data)`
`312`	`312`
`313`	`313`	`std::stringstream s;`
`314`	`314`	`s << client->getTag() << " received error with content: " << data.c_str();`
`315`		`- _sioClientStatus->setString(s.str().c_str());`
	`315`	`+ _sioClientStatus->setString(s.str());`
`316`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,6 @@ void WebSocketDelayTest::onMenuSendTextClicked(cocos2d::Ref *sender)`
`213`	`213`	`{`
`214`	`214`	`std::string warningStr = "send text websocket instance wasn't ready...";`
`215`	`215`	`log("%s", warningStr.c_str());`
`216`		`- _sendTextStatus->setString(warningStr.c_str());`
	`216`	`+ _sendTextStatus->setString(warningStr);`
`217`	`217`	`}`
`218`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ void WebSocketTest::onMessage(network::WebSocket* ws, const network::WebSocket::`
`197`	`197`	`std::string textStr = std::string("response text msg: ")+data.bytes+", "+times;`
`198`	`198`	`log("%s", textStr.c_str());`
`199`	`199`
`200`		`- _sendTextStatus->setString(textStr.c_str());`
	`200`	`+ _sendTextStatus->setString(textStr);`
`201`	`201`	`}`
`202`	`202`	`else`
`203`	`203`	`{`
`@@ -220,7 +220,7 @@ void WebSocketTest::onMessage(network::WebSocket* ws, const network::WebSocket::`
`220`	`220`
`221`	`221`	`binaryStr += std::string(", ")+times;`
`222`	`222`	`log("%s", binaryStr.c_str());`
`223`		`- _sendBinaryStatus->setString(binaryStr.c_str());`
	`223`	`+ _sendBinaryStatus->setString(binaryStr);`
`224`	`224`	`}`
`225`	`225`	`}`
`226`	`226`
`@@ -285,7 +285,7 @@ void WebSocketTest::onMenuSendTextClicked(cocos2d::Ref *sender)`
`285`	`285`	`{`
`286`	`286`	`std::string warningStr = "send text websocket instance wasn't ready...";`
`287`	`287`	`log("%s", warningStr.c_str());`
`288`		`- _sendTextStatus->setString(warningStr.c_str());`
	`288`	`+ _sendTextStatus->setString(warningStr);`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`
`@@ -307,7 +307,7 @@ void WebSocketTest::onMenuSendMultipleTextClicked(cocos2d::Ref *sender)`
`307`	`307`	`{`
`308`	`308`	`std::string warningStr = "send text websocket instance wasn't ready...";`
`309`	`309`	`log("%s", warningStr.c_str());`
`310`		`- _sendTextStatus->setString(warningStr.c_str());`
	`310`	`+ _sendTextStatus->setString(warningStr);`
`311`	`311`	`}`
`312`	`312`	`}`
`313`	`313`
`@@ -327,7 +327,7 @@ void WebSocketTest::onMenuSendBinaryClicked(cocos2d::Ref *sender)`
`327`	`327`	`{`
`328`	`328`	`std::string warningStr = "send binary websocket instance wasn't ready...";`
`329`	`329`	`log("%s", warningStr.c_str());`
`330`		`- _sendBinaryStatus->setString(warningStr.c_str());`
	`330`	`+ _sendBinaryStatus->setString(warningStr);`
`331`	`331`	`}`
`332`	`332`	`}`
`333`	`333`
Original file line number	Diff line number	Diff line change
`@@ -74,31 +74,31 @@ void MouseEventTest::onMouseDown(Event *event)`
`74`	`74`	`EventMouse* e = (EventMouse*)event;`
`75`	`75`	`std::string str = "Mouse Down detected, Key: ";`
`76`	`76`	`str += tostr(static_cast<int>(e->getMouseButton()));`
`77`		`- _labelAction->setString(str.c_str());`
	`77`	`+ _labelAction->setString(str);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`void MouseEventTest::onMouseUp(Event *event)`
`81`	`81`	`{`
`82`	`82`	`EventMouse* e = (EventMouse*)event;`
`83`	`83`	`std::string str = "Mouse Up detected, Key: ";`
`84`	`84`	`str += tostr(static_cast<int>(e->getMouseButton()));`
`85`		`- _labelAction->setString(str.c_str());`
	`85`	`+ _labelAction->setString(str);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`void MouseEventTest::onMouseMove(Event *event)`
`89`	`89`	`{`
`90`	`90`	`EventMouse* e = (EventMouse*)event;`
`91`	`91`	`std::string str = "MousePosition X:";`
`92`	`92`	`str = str + tostr(e->getCursorX()) + " Y:" + tostr(e->getCursorY());`
`93`		`- _labelPosition->setString(str.c_str());`
	`93`	`+ _labelPosition->setString(str);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`void MouseEventTest::onMouseScroll(Event *event)`
`97`	`97`	`{`
`98`	`98`	`EventMouse* e = (EventMouse*)event;`
`99`	`99`	`std::string str = "Mouse Scroll detected, X: ";`
`100`	`100`	`str = str + tostr(e->getScrollX()) + " Y: " + tostr(e->getScrollY());`
`101`		`- _labelAction->setString(str.c_str());`
	`101`	`+ _labelAction->setString(str);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`std::string MouseEventTest::title() const`