From 8b69994d5ca70d9fbac8d8c581dc7ba2bb80efa2 Mon Sep 17 00:00:00 2001
From: James Chen <jianhua.chen@cocos2d-x.org>
Date: Mon, 9 Dec 2013 17:54:21 +0800
Subject: [PATCH] issue #2790: Removes CCBValue.

---
 .../project.pbxproj.REMOVED.git-id            |  2 +-
 cocos/editor-support/cocosbuilder/Android.mk  |  1 -
 .../cocosbuilder/CCBAnimationManager.h        |  1 -
 .../cocosbuilder/CCBMemberVariableAssigner.h  |  1 -
 .../editor-support/cocosbuilder/CCBReader.cpp |  1 -
 .../editor-support/cocosbuilder/CCBValue.cpp  | 29 -------------------
 cocos/editor-support/cocosbuilder/CCBValue.h  | 25 ----------------
 .../cocosbuilder/CCNodeLoader.h               |  1 -
 .../cocosbuilder/CMakeLists.txt               |  1 -
 .../cocosbuilder/CocosBuilder.h               |  1 -
 .../proj.win32/libCocosBuilder.vcxproj        |  2 --
 .../libCocosBuilder.vcxproj.filters           |  6 ----
 12 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 cocos/editor-support/cocosbuilder/CCBValue.cpp
 delete mode 100644 cocos/editor-support/cocosbuilder/CCBValue.h

diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
index 8f1be0f32e..b054635826 100644
--- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-42f742346aec806886a8fd399aa42f689cafa71c
\ No newline at end of file
+77ef9ee3921db604edd06a2cc0b9f9a89259a431
\ No newline at end of file
diff --git a/cocos/editor-support/cocosbuilder/Android.mk b/cocos/editor-support/cocosbuilder/Android.mk
index f5699a7f60..6cf80a9982 100644
--- a/cocos/editor-support/cocosbuilder/Android.mk
+++ b/cocos/editor-support/cocosbuilder/Android.mk
@@ -11,7 +11,6 @@ CCBKeyframe.cpp \
 CCBReader.cpp \
 CCBSequence.cpp \
 CCBSequenceProperty.cpp \
-CCBValue.cpp \
 CCControlButtonLoader.cpp \
 CCControlLoader.cpp \
 CCLabelBMFontLoader.cpp \
diff --git a/cocos/editor-support/cocosbuilder/CCBAnimationManager.h b/cocos/editor-support/cocosbuilder/CCBAnimationManager.h
index b2e62200c7..a5ed09042f 100644
--- a/cocos/editor-support/cocosbuilder/CCBAnimationManager.h
+++ b/cocos/editor-support/cocosbuilder/CCBAnimationManager.h
@@ -4,7 +4,6 @@
 #include "cocos2d.h"
 #include "extensions/ExtensionMacros.h"
 #include "CCBSequence.h"
-#include "CCBValue.h"
 #include "CCBSequenceProperty.h"
 #include "extensions/GUI/CCControlExtension/CCControl.h"
 
diff --git a/cocos/editor-support/cocosbuilder/CCBMemberVariableAssigner.h b/cocos/editor-support/cocosbuilder/CCBMemberVariableAssigner.h
index 594807a3f0..7c429ed505 100644
--- a/cocos/editor-support/cocosbuilder/CCBMemberVariableAssigner.h
+++ b/cocos/editor-support/cocosbuilder/CCBMemberVariableAssigner.h
@@ -2,7 +2,6 @@
 #define _CCB_CCBMEMBERVARIABLEASSIGNER_H_
 
 #include "cocos2d.h"
-#include "CCBValue.h"
 
 namespace cocosbuilder {
 
diff --git a/cocos/editor-support/cocosbuilder/CCBReader.cpp b/cocos/editor-support/cocosbuilder/CCBReader.cpp
index c30506bccf..3e7177badb 100644
--- a/cocos/editor-support/cocosbuilder/CCBReader.cpp
+++ b/cocos/editor-support/cocosbuilder/CCBReader.cpp
@@ -10,7 +10,6 @@
 #include "CCBAnimationManager.h"
 #include "CCBSequenceProperty.h"
 #include "CCBKeyframe.h"
-#include "CCBValue.h"
 
 #include <ctype.h>
 
diff --git a/cocos/editor-support/cocosbuilder/CCBValue.cpp b/cocos/editor-support/cocosbuilder/CCBValue.cpp
deleted file mode 100644
index e47c95d533..0000000000
--- a/cocos/editor-support/cocosbuilder/CCBValue.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "CCBValue.h"
-
-using namespace cocos2d;
-
-namespace cocosbuilder {
-
-// Implementation of Color3BWapper
-
-//Color3BWapper* Color3BWapper::create(const Color3B& color)
-//{
-//    Color3BWapper *ret = new Color3BWapper();
-//    if (ret)
-//    {
-//        ret->color.r = color.r;
-//        ret->color.g = color.g;
-//        ret->color.b = color.b;
-//
-//        ret->autorelease();
-//    }
-//
-//    return ret;
-//}
-//
-//const Color3B& Color3BWapper::getColor() const
-//{
-//    return color;
-//}
-
-}
diff --git a/cocos/editor-support/cocosbuilder/CCBValue.h b/cocos/editor-support/cocosbuilder/CCBValue.h
deleted file mode 100644
index a7a3502af8..0000000000
--- a/cocos/editor-support/cocosbuilder/CCBValue.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __CCB_VALUE_H__
-#define __CCB_VALUE_H__
-
-#include "cocos2d.h"
-
-/*
- These classes are wrapper of basic types, such as Color3B
- */
-
-namespace cocosbuilder {
-
-//class Color3BWapper : public cocos2d::Object
-//{
-//public:
-//    static Color3BWapper* create(const cocos2d::Color3B& color);
-//    
-//    const cocos2d::Color3B& getColor() const;
-//    
-//private:
-//    cocos2d::Color3B color;
-//};
-
-}
-
-#endif // __CCB_VALUE_H__
diff --git a/cocos/editor-support/cocosbuilder/CCNodeLoader.h b/cocos/editor-support/cocosbuilder/CCNodeLoader.h
index 4eb0b27fda..bb18d03866 100644
--- a/cocos/editor-support/cocosbuilder/CCNodeLoader.h
+++ b/cocos/editor-support/cocosbuilder/CCNodeLoader.h
@@ -4,7 +4,6 @@
 #include "extensions/GUI/CCControlExtension/CCInvocation.h"
 #include "cocos2d.h"
 #include "CCBReader.h"
-#include "CCBValue.h"
 #include "extensions/GUI/CCControlExtension/CCControl.h"
 
 namespace cocosbuilder {
diff --git a/cocos/editor-support/cocosbuilder/CMakeLists.txt b/cocos/editor-support/cocosbuilder/CMakeLists.txt
index 00763e1fb7..179f9eb387 100644
--- a/cocos/editor-support/cocosbuilder/CMakeLists.txt
+++ b/cocos/editor-support/cocosbuilder/CMakeLists.txt
@@ -20,7 +20,6 @@ set(CCB_SRC
   CCBKeyframe.cpp
   CCBSequence.cpp
   CCBSequenceProperty.cpp
-  CCBValue.cpp
   CCNode+CCBRelativePositioning.cpp
 )
 
diff --git a/cocos/editor-support/cocosbuilder/CocosBuilder.h b/cocos/editor-support/cocosbuilder/CocosBuilder.h
index 6baa5d2ddc..ffbb45d069 100644
--- a/cocos/editor-support/cocosbuilder/CocosBuilder.h
+++ b/cocos/editor-support/cocosbuilder/CocosBuilder.h
@@ -9,7 +9,6 @@
 #include "cocosbuilder/CCBSelectorResolver.h"
 #include "cocosbuilder/CCBSequence.h"
 #include "cocosbuilder/CCBSequenceProperty.h"
-#include "cocosbuilder/CCBValue.h"
 #include "cocosbuilder/CCControlButtonLoader.h"
 #include "cocosbuilder/CCControlLoader.h"
 #include "cocosbuilder/CCLabelBMFontLoader.h"
diff --git a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj b/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj
index c6238489c7..98571622cf 100644
--- a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj
+++ b/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj
@@ -92,7 +92,6 @@
     <ClCompile Include="..\CCBReader.cpp" />
     <ClCompile Include="..\CCBSequence.cpp" />
     <ClCompile Include="..\CCBSequenceProperty.cpp" />
-    <ClCompile Include="..\CCBValue.cpp" />
     <ClCompile Include="..\CCControlButtonLoader.cpp" />
     <ClCompile Include="..\CCControlLoader.cpp" />
     <ClCompile Include="..\CCLabelBMFontLoader.cpp" />
@@ -119,7 +118,6 @@
     <ClInclude Include="..\CCBSelectorResolver.h" />
     <ClInclude Include="..\CCBSequence.h" />
     <ClInclude Include="..\CCBSequenceProperty.h" />
-    <ClInclude Include="..\CCBValue.h" />
     <ClInclude Include="..\CCControlButtonLoader.h" />
     <ClInclude Include="..\CCControlLoader.h" />
     <ClInclude Include="..\CCLabelBMFontLoader.h" />
diff --git a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.filters b/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.filters
index 8dfedcc4bf..0c0f186095 100644
--- a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.filters
+++ b/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.filters
@@ -14,9 +14,6 @@
     <ClCompile Include="..\CCBSequenceProperty.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CCBValue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\CCControlButtonLoader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -121,9 +118,6 @@
     <ClInclude Include="..\CCBSequenceProperty.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CCBValue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\CCControlButtonLoader.h">
       <Filter>Header Files</Filter>
     </ClInclude>