diff --git a/samples/Cpp/SimpleGame/Classes/AppDelegate.cpp b/samples/Cpp/SimpleGame/Classes/AppDelegate.cpp index a000179f00..c1f7b09f90 100644 --- a/samples/Cpp/SimpleGame/Classes/AppDelegate.cpp +++ b/samples/Cpp/SimpleGame/Classes/AppDelegate.cpp @@ -1,9 +1,8 @@ #include "AppDelegate.h" #include "HelloWorldScene.h" -using namespace cocos2d; +USING_NS_CC; -namespace simplegame { AppDelegate::AppDelegate() { @@ -69,5 +68,3 @@ void AppDelegate::applicationWillEnterForeground() { // if you use SimpleAudioEngine, it must resume here // CocosDenshion::SimpleAudioEngine::sharedEngine()->resumeBackgroundMusic(); } - -} diff --git a/samples/Cpp/SimpleGame/Classes/AppDelegate.h b/samples/Cpp/SimpleGame/Classes/AppDelegate.h index 02996b6aa5..18ee8aeb63 100644 --- a/samples/Cpp/SimpleGame/Classes/AppDelegate.h +++ b/samples/Cpp/SimpleGame/Classes/AppDelegate.h @@ -3,8 +3,6 @@ #include "cocos2d.h" -namespace simplegame { - /** @brief The cocos2d Application. @@ -36,6 +34,5 @@ public: virtual void applicationWillEnterForeground(); }; -} - #endif // _APP_DELEGATE_H_ + diff --git a/samples/Cpp/SimpleGame/Classes/GameOverScene.cpp b/samples/Cpp/SimpleGame/Classes/GameOverScene.cpp index a365b982e6..cc3ffe25c0 100644 --- a/samples/Cpp/SimpleGame/Classes/GameOverScene.cpp +++ b/samples/Cpp/SimpleGame/Classes/GameOverScene.cpp @@ -28,8 +28,6 @@ using namespace cocos2d; -namespace simplegame { - bool GameOverScene::init() { if( Scene::init() ) @@ -93,5 +91,3 @@ GameOverLayer::~GameOverLayer() _label = NULL; } } - -} diff --git a/samples/Cpp/SimpleGame/Classes/GameOverScene.h b/samples/Cpp/SimpleGame/Classes/GameOverScene.h index c64c742e14..a0a994ec6f 100644 --- a/samples/Cpp/SimpleGame/Classes/GameOverScene.h +++ b/samples/Cpp/SimpleGame/Classes/GameOverScene.h @@ -28,8 +28,6 @@ #include "cocos2d.h" -namespace simplegame { - class GameOverLayer : public cocos2d::LayerColor { public: @@ -54,6 +52,4 @@ public: CC_SYNTHESIZE_READONLY(GameOverLayer*, _layer, Layer); }; -} - #endif // _GAME_OVER_SCENE_H_ diff --git a/samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp b/samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp index 7fa03486c3..9b7cc00c3a 100644 --- a/samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp +++ b/samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp @@ -4,8 +4,6 @@ using namespace cocos2d; -namespace simplegame { - HelloWorld::~HelloWorld() { if (_targets) @@ -312,5 +310,3 @@ void HelloWorld::registerWithTouchDispatcher() // TouchDispatcher::sharedDispatcher()->addTargetedDelegate(this,0,true); Director::getInstance()->getTouchDispatcher()->addStandardDelegate(this,0); } - -} diff --git a/samples/Cpp/SimpleGame/Classes/HelloWorldScene.h b/samples/Cpp/SimpleGame/Classes/HelloWorldScene.h index d89280aacb..7a48f48bad 100644 --- a/samples/Cpp/SimpleGame/Classes/HelloWorldScene.h +++ b/samples/Cpp/SimpleGame/Classes/HelloWorldScene.h @@ -5,8 +5,6 @@ //#include "SimpleAudioEngine.h" -namespace simplegame { - class HelloWorld : public cocos2d::LayerColor { public: @@ -46,6 +44,4 @@ protected: }; -} - #endif // __HELLOWORLD_SCENE_H__