From 295bf7f7f22028537d8e3233332a3cd4d0b420bb Mon Sep 17 00:00:00 2001
From: chuanweizhang2013 <chuanweizhanng2013@gmail.com>
Date: Mon, 17 Mar 2014 11:06:50 +0800
Subject: [PATCH] rename variable

---
 cocos/base/CCConsole.cpp | 16 ++++++++--------
 cocos/base/CCConsole.h   |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp
index 2749d7eb3c..3a2b5c76c7 100644
--- a/cocos/base/CCConsole.cpp
+++ b/cocos/base/CCConsole.cpp
@@ -252,8 +252,8 @@ Console::Console()
 , _running(false)
 , _endThread(false)
 , _sendDebugStrings(false)
-,_file_uploading(false)
-,_upload_file_size(0)
+,_fileUploading(false)
+,_uploadFileSize(0)
 {
     // VS2012 doesn't support initializer list, so we create a new array and assign its elements to '_command'.
 	Command commands[] = {     
@@ -762,9 +762,9 @@ void Console::commandUpload(int fd, const std::string& args)
     auto argv = split(args,' ');
     if(argv.size() == 2)
     {
-        _upload_file_name = argv[0];
-        _upload_file_size = std::atoi(argv[1].c_str());
-        _file_uploading = true;        
+        _uploadFileName = argv[0];
+        _uploadFileSize = std::atoi(argv[1].c_str());
+        _fileUploading = true;        
     }
     else 
     {
@@ -970,7 +970,7 @@ void Console::loop()
             for(const auto &fd: _fds) {
                 if(FD_ISSET(fd,&copy_set)) 
                 {
-                    if(!_file_uploading)
+                    if(!_fileUploading)
                     {
                         if( ! parseCommand(fd) )
                         {
@@ -979,8 +979,8 @@ void Console::loop()
                     }
                     else
                     {
-                        readfile(fd, _upload_file_name, _upload_file_size);
-                        _file_uploading = false;
+                        readfile(fd, _uploadFileName, _uploadFileSize);
+                        _fileUploading = false;
 
                     }
                     if(--nready <= 0)
diff --git a/cocos/base/CCConsole.h b/cocos/base/CCConsole.h
index bae7599d04..0d367a8d7c 100644
--- a/cocos/base/CCConsole.h
+++ b/cocos/base/CCConsole.h
@@ -128,9 +128,9 @@ protected:
     bool _running;
     bool _endThread;
 
-    bool _file_uploading;
-    ssize_t _upload_file_size;
-    std::string _upload_file_name;
+    bool _fileUploading;
+    ssize_t _uploadFileSize;
+    std::string _uploadFileName;
     std::string _writablePath;
 
     std::map<std::string, Command> _commands;