Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5985 from andyque/remove_pragma_mark 

issue #4401, remove unused pargma mark macro
This commit is contained in:
minggo 2014-03-26 14:58:37 +08:00
parent 9d4f7467c0 57d8f155df
commit 5e2ffc45ec
15 changed files with 70 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/CCNode.h
View File

@ -1458,9 +1458,7 @@ private:
CC_DISALLOW_COPY_AND_ASSIGN(Node);
};
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - NodeRGBA
#endif
// NodeRGBA
/** NodeRGBA is a subclass of Node that implements the RGBAProtocol protocol.

5
cocos/2d/CCProfiling.cpp
View File

@ -31,10 +31,7 @@ using namespace std;
NS_CC_BEGIN
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - Profiling Categories
#endif
// Profiling Categories
/* set to false the categories that you don't want to profile */
bool kProfilerCategorySprite = false;
bool kProfilerCategoryBatchSprite = false;

25
cocos/2d/CCScriptSupport.cpp
View File

@ -41,10 +41,8 @@ bool CC_DLL cc_assert_script_compatible(const char *msg)
NS_CC_BEGIN
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
// #pragma mark -
// #pragma mark ScriptHandlerEntry
#endif
//
// // ScriptHandlerEntry
ScriptHandlerEntry* ScriptHandlerEntry::create(int handler)
{
@ -63,10 +61,8 @@ ScriptHandlerEntry::~ScriptHandlerEntry(void)
}
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
// #pragma mark -
// #pragma mark SchedulerScriptHandlerEntry
#endif
//
// // SchedulerScriptHandlerEntry
SchedulerScriptHandlerEntry* SchedulerScriptHandlerEntry::create(int handler, float interval, bool paused)
{
@ -91,10 +87,9 @@ SchedulerScriptHandlerEntry::~SchedulerScriptHandlerEntry(void)
LUALOG("[LUA] DEL script schedule %d, entryID: %d", _handler, _entryId);
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
// #pragma mark -
// #pragma mark TouchScriptHandlerEntry
#endif
//
// // TouchScriptHandlerEntry
TouchScriptHandlerEntry* TouchScriptHandlerEntry::create(int handler,
bool isMultiTouches,
@ -120,10 +115,8 @@ bool TouchScriptHandlerEntry::init(bool isMultiTouches, int priority, bool swall
return true;
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
// #pragma mark -
// #pragma mark ScriptEngineManager
#endif
//
// // ScriptEngineManager
static ScriptEngineManager* s_pSharedScriptEngineManager = nullptr;

6
cocos/2d/ccCArray.cpp
View File

@ -278,10 +278,8 @@ void ccArrayFullRemoveArray(ccArray *arr, ccArray *minusArr)
arr->num -= back;
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
// #pragma mark -
// #pragma mark ccCArray for Values (c structures)
#endif
//
// // ccCArray for Values (c structures)
/** Allocates and initializes a new C array with specified capacity */
ccCArray* ccCArrayNew(ssize_t capacity)

6
cocos/2d/ccCArray.h
View File

@ -130,10 +130,8 @@ void ccArrayRemoveArray(ccArray *arr, ccArray *minusArr);
matching instances in arr will be removed. */
void ccArrayFullRemoveArray(ccArray *arr, ccArray *minusArr);
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
// #pragma mark -
// #pragma mark ccCArray for Values (c structures)
#endif
//
// // ccCArray for Values (c structures)
typedef struct _ccCArray {
ssize_t num, max;

9
cocos/2d/ccGLStateCache.cpp
View File

@ -217,9 +217,7 @@ void bindVAO(GLuint vaoId)
}
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - GL Vertex Attrib functions
#endif
// GL Vertex Attrib functions
void enableVertexAttribs( unsigned int flags )
{
@ -262,9 +260,8 @@ void enableVertexAttribs( unsigned int flags )
}
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - GL Uniforms functions
#endif
// GL Uniforms functions
void setProjectionMatrixDirty( void )
{
s_currentProjectionMatrix = -1;

18
cocos/ui/GUIDefine.h
View File

@ -30,12 +30,9 @@
#include <string>
#include "cocostudio/ObjectFactory.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
#pragma mark -
#pragma mark Widget macro
#pragma mark -
#endif
//
//// Widget macro
//
#define DECLARE_CLASS_GUI_INFO \
public: \
@ -53,12 +50,9 @@
cocostudio::ObjectFactory::TInfo(#className, &className::createInstance) \
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
#pragma mark -
#pragma mark Reader macro
#pragma mark -
#endif
//
//// Reader macro
//
#define DECLARE_CLASS_WIDGET_READER_INFO \
public: \

11
extensions/GUI/CCControlExtension/CCControlStepper.cpp
View File

@ -129,7 +129,7 @@ ControlStepper* ControlStepper::create(Sprite *minusSprite, Sprite *plusSprite)
return pRet;
}
//#pragma mark Properties
//// Properties
void ControlStepper::setWraps(bool wraps)
{
@ -190,11 +190,8 @@ bool ControlStepper::isContinuous() const
{
return _continuous;
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark -
//#pragma mark ControlStepper Public Methods
#endif
//
//// ControlStepper Public Methods
void ControlStepper::setValueWithSendingEvent(double value, bool send)
{
@ -249,7 +246,7 @@ void ControlStepper::update(float dt)
}
}
//#pragma mark ControlStepper Private Methods
//// ControlStepper Private Methods
void ControlStepper::updateLayoutUsingTouchLocation(Point location)
{

25
tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp
View File

@ -1432,9 +1432,7 @@ std::string ActionTargetedReverse::subtitle() const
return "Action that runs reversely on another target. Useful for sequences";
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - ActionStacked
#endif
// ActionStacked
void ActionStacked::onEnter()
{
@ -1488,9 +1486,8 @@ std::string ActionStacked::subtitle() const
return "Tap screen";
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - ActionMoveStacked
#endif
// ActionMoveStacked
void ActionMoveStacked::runActionsInSprite(Sprite *sprite)
{
@ -1516,9 +1513,7 @@ std::string ActionMoveStacked::title() const
return "Stacked MoveBy/To actions";
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - ActionMoveJumpStacked
#endif
// ActionMoveJumpStacked
void ActionMoveJumpStacked::runActionsInSprite(Sprite *sprite)
{
@ -1543,9 +1538,7 @@ std::string ActionMoveJumpStacked::title() const
return "tacked Move + Jump actions";
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - ActionMoveBezierStacked
#endif
// ActionMoveBezierStacked
void ActionMoveBezierStacked::runActionsInSprite(Sprite *sprite)
{
@ -1577,7 +1570,7 @@ std::string ActionMoveBezierStacked::title() const
}
//#pragma mark - ActionCatmullRomStacked
// ActionCatmullRomStacked
void ActionCatmullRomStacked::onEnter()
{
@ -1699,9 +1692,7 @@ std::string ActionCatmullRomStacked::subtitle() const
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - ActionCardinalSplineStacked
#endif
// ActionCardinalSplineStacked
void ActionCardinalSplineStacked::onEnter()
{
@ -2354,4 +2345,4 @@ void ActionRemoveSelf::onEnter()
std::string ActionRemoveSelf::subtitle() const
{
return "Sequence: Move + Rotate + Scale + RemoveSelf";
}
i

43
tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
View File

@ -66,7 +66,7 @@ static Layer* restartAction()
return layer;
}
//#pragma mark Demo examples start here
//// Demo examples start here
//@implementation BaseClippingNodeTest
@ -130,9 +130,7 @@ void BaseClippingNodeTest::setup()
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - BasicTest
#endif
// BasicTest
std::string BasicTest::title() const
{
@ -211,9 +209,7 @@ Node* BasicTest::content()
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - ShapeTest
#endif
// ShapeTest
std::string ShapeTest::title() const
{
@ -239,9 +235,8 @@ Node* ShapeTest::content()
return node;
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - ShapeInvertedTest
#endif
// ShapeInvertedTest
std::string ShapeInvertedTest::title() const
{
@ -260,9 +255,7 @@ ClippingNode* ShapeInvertedTest::clipper()
return clipper;
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - SpriteTest
#endif
// SpriteTest
std::string SpriteTest::title() const
{
@ -295,9 +288,7 @@ Node* SpriteTest::content()
return node;
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - SpriteNoAlphaTest
#endif
// SpriteNoAlphaTest
std::string SpriteNoAlphaTest::title() const
{
@ -316,9 +307,7 @@ ClippingNode* SpriteNoAlphaTest::clipper()
return clipper;
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - SpriteInvertedTest
#endif
// SpriteInvertedTest
std::string SpriteInvertedTest::title() const
{
@ -338,9 +327,7 @@ ClippingNode* SpriteInvertedTest::clipper()
return clipper;
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - NestedTest
#endif
// NestedTest
std::string NestedTest::title() const
{
@ -385,9 +372,7 @@ void NestedTest::setup()
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - HoleDemo
#endif
// HoleDemo
HoleDemo::~HoleDemo()
{
@ -482,9 +467,7 @@ void HoleDemo::onTouchesBegan(const std::vector<Touch*>& touches, Event* event)
this->pokeHoleAtPoint(point);
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - ScrollViewDemo
#endif
// ScrollViewDemo
std::string ScrollViewDemo::title() const
{
@ -560,9 +543,7 @@ void ScrollViewDemo::onTouchesEnded(const std::vector<Touch*>& touches, Event *
_scrolling = false;
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - RawStencilBufferTests
#endif
// RawStencilBufferTests
//#if COCOS2D_DEBUG > 1

16
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp
View File

@ -10,11 +10,9 @@
USING_NS_CC;
USING_NS_CC_EXT;
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
#pragma mark -
#pragma mark CustomImageLayer
#pragma mark -
#endif
// CustomImageLayer
void CustomImageLayer::onEnter()
{
@ -30,11 +28,9 @@ void CustomImageLayer::onEnter()
addChild(layout);
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
#pragma mark -
#pragma mark CustomImageScene
#pragma mark -
#endif
// CustomImageScene
void CustomImageScene::onEnter()
{

16
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp
View File

@ -18,11 +18,9 @@ USING_NS_CC_EXT;
using namespace ui;
using namespace cocostudio;
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
#pragma mark -
#pragma mark CustomParticleWidgetLayer
#pragma mark -
#endif
// CustomParticleWidgetLayer
void CustomParticleWidgetLayer::onEnter()
{
@ -40,11 +38,9 @@ void CustomParticleWidgetLayer::onEnter()
addChild(custom, 10, -1);
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
#pragma mark -
#pragma mark CustomImageScene
#pragma mark -
#endif
// CustomImageScene
void CustomParticleWidgetScene::onEnter()
{

24
tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp
View File

@ -45,9 +45,7 @@ void FileUtilsTestScene::runThisTest()
Director::getInstance()->replaceScene(this);
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
// #pragma mark - FileUtilsDemo
#endif
// FileUtilsDemo
void FileUtilsDemo::onEnter()
{
@ -94,9 +92,7 @@ std::string FileUtilsDemo::subtitle() const
return "";
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - TestResolutionDirectories
#endif
// TestResolutionDirectories
void TestResolutionDirectories::onEnter()
{
@ -150,9 +146,7 @@ std::string TestResolutionDirectories::subtitle() const
return "See the console";
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - TestSearchPath
#endif
// TestSearchPath
void TestSearchPath::onEnter()
{
@ -231,9 +225,7 @@ std::string TestSearchPath::subtitle() const
return "See the console";
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - TestFilenameLookup
#endif
// TestFilenameLookup
void TestFilenameLookup::onEnter()
{
@ -271,9 +263,7 @@ std::string TestFilenameLookup::title() const
return "FileUtils: filename lookup";
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - TestIsFileExist
#endif
// TestIsFileExist
void TestIsFileExist::onEnter()
{
@ -317,9 +307,7 @@ std::string TestIsFileExist::subtitle() const
return "";
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - TestWritePlist
#endif
// TestWritePlist
void TextWritePlist::onEnter()
{

6
tests/cpp-tests/Classes/LayerTest/LayerTest.cpp
View File

@ -111,9 +111,7 @@ void LayerTest::backCallback(Ref* sender)
s->release();
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
//#pragma mark - Cascading support extensions
#endif
// Cascading support extensions
static void setEnableRecursiveCascading(Node* node, bool enable)
{
@ -277,7 +275,7 @@ std::string LayerTestCascadingOpacityC::subtitle() const
}
//#pragma mark Example LayerTestCascadingColor
//// Example LayerTestCascadingColor
// LayerTestCascadingColorA
void LayerTestCascadingColorA::onEnter()

4
tests/lua-tests/src/LayerTest/LayerTest.lua
View File

@ -32,7 +32,7 @@ local function createLayerDemoLayer(title, subtitle)
return layer
end
--#pragma mark - Cascading support extensions
-- Cascading support extensions
local function setEnableRecursiveCascading(node, enable)
if node == nil then
@ -164,7 +164,7 @@ local function LayerTestCascadingOpacityC()
return ret
end
--#pragma mark Example LayerTestCascadingColor
--// Example LayerTestCascadingColor
-- LayerTestCascadingColorA
local function LayerTestCascadingColorA()