From 9dd778edb0d7d6907989524b9b3154e208906411 Mon Sep 17 00:00:00 2001 From: WenhaiLin Date: Tue, 24 Mar 2015 20:23:51 +0800 Subject: [PATCH] [ci skip]Update comments --- cocos/2d/CCComponent.h | 5 +- cocos/2d/CCComponentContainer.h | 5 +- cocos/2d/CCFont.h | 7 ++- cocos/2d/CCFontAtlas.h | 10 ++-- cocos/2d/CCFontAtlasCache.h | 7 ++- cocos/2d/CCFontCharMap.h | 4 +- cocos/2d/CCFontFNT.h | 4 +- cocos/2d/CCFontFreeType.h | 4 +- cocos/2d/CCLabelBMFont.h | 7 ++- cocos/2d/CCLabelTTF.h | 6 ++- cocos/2d/CCLabelTextFormatter.h | 6 +-- cocos/2d/CCTMXXMLParser.h | 6 ++- cocos/2d/CCTweenFunction.h | 5 +- cocos/3d/cocos3d.h | 2 +- cocos/base/CCConsole.h | 5 +- cocos/base/CCDataVisitor.h | 8 ++- cocos/base/CCEventType.h | 4 +- cocos/base/CCGameController.h | 5 +- cocos/base/CCProfiling.h | 5 +- cocos/base/CCProtocols.h | 4 +- cocos/base/CCRefPtr.h | 10 ++-- cocos/base/TGAlib.h | 4 +- cocos/base/ZipUtils.h | 4 +- cocos/base/allocator/CCAllocatorBase.h | 3 +- cocos/base/allocator/CCAllocatorDiagnostics.h | 3 +- cocos/base/allocator/CCAllocatorGlobal.h | 3 +- cocos/base/allocator/CCAllocatorMacros.h | 3 +- cocos/base/allocator/CCAllocatorMutex.h | 3 +- .../allocator/CCAllocatorStrategyDefault.h | 3 +- .../allocator/CCAllocatorStrategyFixedBlock.h | 3 +- .../CCAllocatorStrategyGlobalSmallBlock.h | 3 +- .../base/allocator/CCAllocatorStrategyPool.h | 3 +- cocos/base/atitc.h | 7 ++- cocos/base/base64.h | 4 +- cocos/base/ccCArray.h | 4 +- cocos/base/ccFPSImages.h | 49 ++++++++++--------- cocos/base/etc1.h | 2 + cocos/base/firePngData.h | 4 ++ cocos/base/s3tc.h | 7 ++- cocos/base/uthash.h | 2 + cocos/base/utlist.h | 3 +- cocos/deprecated/CCArray.h | 5 +- cocos/deprecated/CCBool.h | 4 +- cocos/deprecated/CCDeprecated.h | 6 ++- cocos/deprecated/CCDictionary.h | 4 +- cocos/deprecated/CCDouble.h | 4 +- cocos/deprecated/CCFloat.h | 4 +- cocos/deprecated/CCInteger.h | 4 +- cocos/deprecated/CCNotificationCenter.h | 4 +- cocos/deprecated/CCSet.h | 5 +- cocos/deprecated/CCString.h | 5 +- cocos/network/HttpAsynConnection.h | 5 +- cocos/network/HttpCookie.h | 4 +- cocos/platform/CCApplication.h | 4 +- cocos/platform/CCCommon.h | 4 +- cocos/platform/CCGL.h | 4 +- cocos/platform/CCImage.h | 4 +- cocos/platform/CCPlatformConfig.h | 5 +- cocos/platform/CCPlatformDefine.h | 4 +- cocos/platform/CCPlatformMacros.h | 5 +- cocos/platform/CCSAXParser.h | 2 + cocos/platform/CCStdC.h | 2 +- cocos/platform/CCThread.h | 4 +- cocos/renderer/CCRenderCommandPool.h | 5 +- cocos/renderer/ccShaders.h | 5 +- cocos/ui/UIDeprecated.h | 4 +- cocos/ui/UIWebView-inl.h | 6 +-- cocos/ui/UIWebViewImpl-android.h | 4 +- cocos/ui/UIWebViewImpl-ios.h | 4 +- 69 files changed, 216 insertions(+), 140 deletions(-) diff --git a/cocos/2d/CCComponent.h b/cocos/2d/CCComponent.h index c52db45b3c..90d6de8ca3 100644 --- a/cocos/2d/CCComponent.h +++ b/cocos/2d/CCComponent.h @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,8 @@ THE SOFTWARE. #ifndef __CC_FRAMEWORK_COMPONENT_H__ #define __CC_FRAMEWORK_COMPONENT_H__ +/// @cond DO_NOT_SHOW + #include "base/CCRef.h" #include "base/CCScriptSupport.h" #include @@ -80,4 +82,5 @@ protected: NS_CC_END +/// @endcond #endif // __FUNDATION__CCCOMPONENT_H__ diff --git a/cocos/2d/CCComponentContainer.h b/cocos/2d/CCComponentContainer.h index 94677c73f0..48fde89775 100644 --- a/cocos/2d/CCComponentContainer.h +++ b/cocos/2d/CCComponentContainer.h @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,8 @@ THE SOFTWARE. #ifndef __CC_FRAMEWORK_COMCONTAINER_H__ #define __CC_FRAMEWORK_COMCONTAINER_H__ +/// @cond DO_NOT_SHOW + #include "base/CCMap.h" #include @@ -68,4 +70,5 @@ private: NS_CC_END +/// @endcond #endif // __FUNDATION__CCCOMPONENT_H__ diff --git a/cocos/2d/CCFont.h b/cocos/2d/CCFont.h index d0b389579a..a23119f986 100644 --- a/cocos/2d/CCFont.h +++ b/cocos/2d/CCFont.h @@ -26,6 +26,8 @@ #ifndef _CCFont_h_ #define _CCFont_h_ +/// @cond DO_NOT_SHOW + #include #include "2d/CCLabel.h" @@ -33,8 +35,6 @@ NS_CC_BEGIN class FontAtlas; -/// @cond - class CC_DLL Font : public Ref { public: @@ -65,8 +65,7 @@ protected: }; -/// @endcond - NS_CC_END +/// @endcond #endif diff --git a/cocos/2d/CCFontAtlas.h b/cocos/2d/CCFontAtlas.h index 578fba6e67..b769f0944e 100644 --- a/cocos/2d/CCFontAtlas.h +++ b/cocos/2d/CCFontAtlas.h @@ -22,9 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + #ifndef _CCFontAtlas_h_ #define _CCFontAtlas_h_ +/// @cond DO_NOT_SHOW + #include #include @@ -34,14 +37,11 @@ NS_CC_BEGIN -//fwd class Font; class Texture2D; class EventCustom; class EventListenerCustom; -/// @cond - struct FontLetterDefinition { unsigned short letteCharUTF16; @@ -130,9 +130,7 @@ protected: bool _antialiasEnabled; }; -/// @endcond - NS_CC_END - +/// @endcond #endif /* defined(__cocos2d_libs__CCFontAtlas__) */ diff --git a/cocos/2d/CCFontAtlasCache.h b/cocos/2d/CCFontAtlasCache.h index a45bc1ef11..2bdd93ad3d 100644 --- a/cocos/2d/CCFontAtlasCache.h +++ b/cocos/2d/CCFontAtlasCache.h @@ -26,6 +26,8 @@ #ifndef _CCFontAtlasCache_h_ #define _CCFontAtlasCache_h_ +/// @cond DO_NOT_SHOW + #include #include "2d/CCLabel.h" @@ -34,8 +36,6 @@ NS_CC_BEGIN class FontAtlas; -/// @cond - class CC_DLL FontAtlasCache { public: @@ -58,8 +58,7 @@ private: static std::unordered_map _atlasMap; }; -/// @endcond - NS_CC_END +/// @endcond #endif diff --git a/cocos/2d/CCFontCharMap.h b/cocos/2d/CCFontCharMap.h index 8412aa2a84..78ad9abbd9 100644 --- a/cocos/2d/CCFontCharMap.h +++ b/cocos/2d/CCFontCharMap.h @@ -26,12 +26,12 @@ #ifndef _CCFontCharMap_h_ #define _CCFontCharMap_h_ +/// @cond DO_NOT_SHOW + #include "2d/CCFont.h" NS_CC_BEGIN -/// @cond - class FontCharMap : public Font { public: diff --git a/cocos/2d/CCFontFNT.h b/cocos/2d/CCFontFNT.h index 5a7a8a9be4..d2b83e9886 100644 --- a/cocos/2d/CCFontFNT.h +++ b/cocos/2d/CCFontFNT.h @@ -26,14 +26,14 @@ #ifndef _CCFontFNT_h_ #define _CCFontFNT_h_ +/// @cond DO_NOT_SHOW + #include "CCFont.h" NS_CC_BEGIN class BMFontConfiguration; -/// @cond FontFNT - class CC_DLL FontFNT : public Font { diff --git a/cocos/2d/CCFontFreeType.h b/cocos/2d/CCFontFreeType.h index 4ea7e29129..8b65baab0e 100644 --- a/cocos/2d/CCFontFreeType.h +++ b/cocos/2d/CCFontFreeType.h @@ -26,6 +26,8 @@ #ifndef _FontFreetype_h_ #define _FontFreetype_h_ +/// @cond DO_NOT_SHOW + #include "CCFont.h" #include @@ -46,8 +48,6 @@ NS_CC_BEGIN -/// @cond - class CC_DLL FontFreeType : public Font { public: diff --git a/cocos/2d/CCLabelBMFont.h b/cocos/2d/CCLabelBMFont.h index 472021fc88..2034b6528b 100644 --- a/cocos/2d/CCLabelBMFont.h +++ b/cocos/2d/CCLabelBMFont.h @@ -34,6 +34,8 @@ Use any of these editors to generate BMFonts: #ifndef __CCBITMAP_FONT_ATLAS_H__ #define __CCBITMAP_FONT_ATLAS_H__ +/// @cond DO_NOT_SHOW + #include "2d/CCLabel.h" #if CC_LABELBMFONT_DEBUG_DRAW #include "renderer/CCCustomCommand.h" @@ -42,8 +44,6 @@ Use any of these editors to generate BMFonts: NS_CC_BEGIN -/// @cond - #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #elif _MSC_VER >= 1400 //vs 2005 or higher @@ -157,8 +157,7 @@ private: #pragma warning (pop) #endif -/// @endcond - NS_CC_END +/// @endcond #endif //__CCBITMAP_FONT_ATLAS_H__ diff --git a/cocos/2d/CCLabelTTF.h b/cocos/2d/CCLabelTTF.h index 1275413d06..c4313a961f 100644 --- a/cocos/2d/CCLabelTTF.h +++ b/cocos/2d/CCLabelTTF.h @@ -23,9 +23,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + #ifndef __CCLABELTTF_H__ #define __CCLABELTTF_H__ +/// @cond DO_NOT_SHOW + #include "2d/CCNode.h" NS_CC_BEGIN @@ -171,9 +174,8 @@ protected: #pragma warning (pop) #endif -/// @endcond - NS_CC_END +/// @endcond #endif //__CCLABEL_H__ diff --git a/cocos/2d/CCLabelTextFormatter.h b/cocos/2d/CCLabelTextFormatter.h index 73f07fe7fb..8efdb19dc0 100644 --- a/cocos/2d/CCLabelTextFormatter.h +++ b/cocos/2d/CCLabelTextFormatter.h @@ -26,13 +26,14 @@ #ifndef _CCLabelTextFormatter_h_ #define _CCLabelTextFormatter_h_ +/// @cond DO_NOT_SHOW + #include "platform/CCPlatformMacros.h" NS_CC_BEGIN class Label; -/// @cond class CC_DLL LabelTextFormatter { public: @@ -43,8 +44,7 @@ public: }; -/// @endcond - NS_CC_END +/// @endcond #endif diff --git a/cocos/2d/CCTMXXMLParser.h b/cocos/2d/CCTMXXMLParser.h index 6c011a25c2..83009f2da7 100644 --- a/cocos/2d/CCTMXXMLParser.h +++ b/cocos/2d/CCTMXXMLParser.h @@ -2,7 +2,7 @@ Copyright (c) 2009-2010 Ricardo Quesada Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2011 Zynga Inc. -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -29,6 +29,8 @@ THE SOFTWARE. #ifndef __CC_TM_XML_PARSER__ #define __CC_TM_XML_PARSER__ +/// @cond DO_NOT_SHOW + #include "math/CCGeometry.h" #include "platform/CCSAXParser.h" #include "base/CCVector.h" @@ -323,5 +325,5 @@ protected: NS_CC_END +/// @endcond #endif - diff --git a/cocos/2d/CCTweenFunction.h b/cocos/2d/CCTweenFunction.h index dc5d6eeb31..e917d083b7 100644 --- a/cocos/2d/CCTweenFunction.h +++ b/cocos/2d/CCTweenFunction.h @@ -1,5 +1,5 @@ /**************************************************************************** -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,8 @@ THE SOFTWARE. #ifndef __CCTWEENFUNCTION_H__ #define __CCTWEENFUNCTION_H__ +/// @cond DO_NOT_SHOW + #include "platform/CCPlatformMacros.h" NS_CC_BEGIN @@ -293,4 +295,5 @@ namespace tweenfunc { NS_CC_END +/// @endcond #endif /*__CCTWEENFUNCTION_H__*/ diff --git a/cocos/3d/cocos3d.h b/cocos/3d/cocos3d.h index 87b4575980..ac56179ed9 100755 --- a/cocos/3d/cocos3d.h +++ b/cocos/3d/cocos3d.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (c) 2014-2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/cocos/base/CCConsole.h b/cocos/base/CCConsole.h index 85cb33ee7f..2ab3fc93b3 100644 --- a/cocos/base/CCConsole.h +++ b/cocos/base/CCConsole.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,9 +22,9 @@ THE SOFTWARE. ****************************************************************************/ - #ifndef __CCCONSOLE_H__ #define __CCCONSOLE_H__ +/// @cond DO_NOT_SHOW #if defined(_MSC_VER) || defined(__MINGW32__) #include @@ -158,4 +158,5 @@ private: NS_CC_END +/// @endcond #endif /* defined(__CCCONSOLE_H__) */ diff --git a/cocos/base/CCDataVisitor.h b/cocos/base/CCDataVisitor.h index 42c51736d7..2b089e0b05 100644 --- a/cocos/base/CCDataVisitor.h +++ b/cocos/base/CCDataVisitor.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,6 +24,7 @@ #ifndef __CCDATAVISITOR_H__ #define __CCDATAVISITOR_H__ +/// @cond DO_NOT_SHOW #include "platform/CCPlatformMacros.h" #include @@ -40,10 +41,6 @@ class __Array; class __Dictionary; class __Set; -/** - * @cond - */ - /** * Visitor that helps to perform action that depends on polymorphic object type * @@ -111,4 +108,5 @@ private: NS_CC_END +/// @endcond #endif // __CCDATAVISITOR_H__ diff --git a/cocos/base/CCEventType.h b/cocos/base/CCEventType.h index ab2c4350d5..8d6d9e80c1 100644 --- a/cocos/base/CCEventType.h +++ b/cocos/base/CCEventType.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,6 +24,7 @@ #ifndef __CCEVENT_TYPE_H__ #define __CCEVENT_TYPE_H__ +/// @cond DO_NOT_SHOW /** * This header is used for defining event types using in NotificationCenter @@ -43,4 +44,5 @@ // This message is posted in cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp and cocos\platform\wp8-xaml\cpp\Cocos2dRenderer.cpp. #define EVENT_COME_TO_BACKGROUND "event_come_to_background" +/// @endcond #endif // __CCEVENT_TYPE_H__ diff --git a/cocos/base/CCGameController.h b/cocos/base/CCGameController.h index fbc93bce17..4358c41cf2 100644 --- a/cocos/base/CCGameController.h +++ b/cocos/base/CCGameController.h @@ -1,6 +1,5 @@ /**************************************************************************** - Copyright (c) 2014 cocos2d-x.org - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (c) 2014-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,9 +24,11 @@ #ifndef __cocos2d_libs__CCGameController__ #define __cocos2d_libs__CCGameController__ +/// @cond DO_NOT_SHOW #include "base/CCController.h" #include "base/CCEventController.h" #include "base/CCEventListenerController.h" +/// @endcond #endif /* defined(__cocos2d_libs__CCGameController__) */ diff --git a/cocos/base/CCProfiling.h b/cocos/base/CCProfiling.h index 63625f6702..ffb99e190a 100644 --- a/cocos/base/CCProfiling.h +++ b/cocos/base/CCProfiling.h @@ -1,7 +1,7 @@ /**************************************************************************** Copyright (c) 2010 Stuart Carnie Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,8 +23,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + #ifndef __SUPPORT_CCPROFILING_H__ #define __SUPPORT_CCPROFILING_H__ +/// @cond DO_NOT_SHOW #include #include @@ -161,4 +163,5 @@ extern bool kProfilerCategoryParticles; NS_CC_END +/// @endcond #endif // __SUPPORT_CCPROFILING_H__ diff --git a/cocos/base/CCProtocols.h b/cocos/base/CCProtocols.h index b12daa781f..337b8876c0 100644 --- a/cocos/base/CCProtocols.h +++ b/cocos/base/CCProtocols.h @@ -1,7 +1,7 @@ /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,6 +26,7 @@ THE SOFTWARE. #ifndef __BASE_CCPROTOCOLS_H__ #define __BASE_CCPROTOCOLS_H__ +/// @cond DO_NOT_SHOW #include @@ -268,4 +269,5 @@ public: NS_CC_END +/// @endcond #endif // __BASE_CCPROTOCOLS_H__ diff --git a/cocos/base/CCRefPtr.h b/cocos/base/CCRefPtr.h index a9a7339444..60f833f1be 100644 --- a/cocos/base/CCRefPtr.h +++ b/cocos/base/CCRefPtr.h @@ -1,6 +1,6 @@ /**************************************************************************** - Copyright (c) 2014 PlayFirst Inc. - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (c) 2014 PlayFirst Inc. + Copyright (c) 2014-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,7 @@ #ifndef __CC_REF_PTR_H__ #define __CC_REF_PTR_H__ +/// @cond DO_NOT_SHOW #include "base/CCRef.h" #include "base/ccMacros.h" @@ -33,8 +34,6 @@ NS_CC_BEGIN /** - * @cond DO_NOT_SHOW - * * Utility/support macros. Defined to enable RefPtr to contain types like 'const T' because we do not * regard retain()/release() as affecting mutability of state. */ @@ -307,8 +306,7 @@ template RefPtr dynamic_pointer_cast(const RefPtr & r) #undef CC_REF_PTR_SAFE_RELEASE #undef CC_REF_PTR_SAFE_RELEASE_NULL -/** @} */ - NS_CC_END +/// @endcond #endif // __CC_REF_PTR_H__ diff --git a/cocos/base/TGAlib.h b/cocos/base/TGAlib.h index 987826dd8f..3f51088d00 100644 --- a/cocos/base/TGAlib.h +++ b/cocos/base/TGAlib.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,7 @@ THE SOFTWARE. #ifndef __SUPPORT_DATA_SUPPORT_TGALIB_H__ #define __SUPPORT_DATA_SUPPORT_TGALIB_H__ +/// @cond DO_NOT_SHOW namespace cocos2d { @@ -73,4 +74,5 @@ void tgaDestroy(tImageTGA *info); }//namespace cocos2d +/// @endcond #endif // __SUPPORT_DATA_SUPPORT_TGALIB_H__ diff --git a/cocos/base/ZipUtils.h b/cocos/base/ZipUtils.h index a8db2e6029..310a51ffdb 100644 --- a/cocos/base/ZipUtils.h +++ b/cocos/base/ZipUtils.h @@ -22,8 +22,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + #ifndef __SUPPORT_ZIPUTILS_H__ #define __SUPPORT_ZIPUTILS_H__ +/// @cond DO_NOT_SHOW #include #include "platform/CCPlatformConfig.h" @@ -294,5 +296,5 @@ typedef struct unz_file_info_s unz_file_info; // end group /// @} +/// @endcond #endif // __SUPPORT_ZIPUTILS_H__ - diff --git a/cocos/base/allocator/CCAllocatorBase.h b/cocos/base/allocator/CCAllocatorBase.h index 720d4ed936..3282e2557c 100644 --- a/cocos/base/allocator/CCAllocatorBase.h +++ b/cocos/base/allocator/CCAllocatorBase.h @@ -25,7 +25,7 @@ #ifndef CC_ALLOCATOR_BASE_H #define CC_ALLOCATOR_BASE_H -/// @cond +/// @cond DO_NOT_SHOW #include @@ -113,5 +113,4 @@ NS_CC_ALLOCATOR_END NS_CC_END /// @endcond - #endif//CC_ALLOCATOR_BASE_H diff --git a/cocos/base/allocator/CCAllocatorDiagnostics.h b/cocos/base/allocator/CCAllocatorDiagnostics.h index ccab120f18..f9ea712ca0 100644 --- a/cocos/base/allocator/CCAllocatorDiagnostics.h +++ b/cocos/base/allocator/CCAllocatorDiagnostics.h @@ -25,7 +25,7 @@ #ifndef CC_ALLOCATOR_DIAGNOSTICS_H #define CC_ALLOCATOR_DIAGNOSTICS_H -/// @cond +/// @cond DO_NOT_SHOW #include @@ -59,5 +59,4 @@ NS_CC_ALLOCATOR_END NS_CC_END /// @endcond - #endif//CC_ALLOCATOR_DIAGNOSTICS_H diff --git a/cocos/base/allocator/CCAllocatorGlobal.h b/cocos/base/allocator/CCAllocatorGlobal.h index 24e63db160..0491f34fd8 100644 --- a/cocos/base/allocator/CCAllocatorGlobal.h +++ b/cocos/base/allocator/CCAllocatorGlobal.h @@ -25,7 +25,7 @@ #ifndef CC_ALLOCATOR_GLOBAL_H #define CC_ALLOCATOR_GLOBAL_H -/// @cond +/// @cond DO_NOT_SHOW #include "base/allocator/CCAllocatorMacros.h" #include "base/allocator/CCAllocatorStrategyDefault.h" @@ -40,5 +40,4 @@ NS_CC_ALLOCATOR_END NS_CC_END /// @endcond - #endif//CC_ALLOCATOR_GLOBAL_H diff --git a/cocos/base/allocator/CCAllocatorMacros.h b/cocos/base/allocator/CCAllocatorMacros.h index 4ec2da588a..be1cbcd9d0 100644 --- a/cocos/base/allocator/CCAllocatorMacros.h +++ b/cocos/base/allocator/CCAllocatorMacros.h @@ -25,7 +25,7 @@ #ifndef CC_ALLOCATOR_MACROS_H #define CC_ALLOCATOR_MACROS_H -/// @cond +/// @cond DO_NOT_SHOW #include "base/ccConfig.h" #include "platform/CCPlatformMacros.h" @@ -128,5 +128,4 @@ } /// @endcond - #endif//CC_ALLOCATOR_MACROS_H diff --git a/cocos/base/allocator/CCAllocatorMutex.h b/cocos/base/allocator/CCAllocatorMutex.h index a1937fd02e..778549f872 100644 --- a/cocos/base/allocator/CCAllocatorMutex.h +++ b/cocos/base/allocator/CCAllocatorMutex.h @@ -25,7 +25,7 @@ #ifndef CC_ALLOCATOR_MUTEX_H #define CC_ALLOCATOR_MUTEX_H -/// @cond +/// @cond DO_NOT_SHOW #include "platform/CCPlatformMacros.h" @@ -122,5 +122,4 @@ NS_CC_ALLOCATOR_END NS_CC_END /// @endcond - #endif//CC_ALLOCATOR_MUTEX_H diff --git a/cocos/base/allocator/CCAllocatorStrategyDefault.h b/cocos/base/allocator/CCAllocatorStrategyDefault.h index 6888d14b2b..8c864e43a7 100644 --- a/cocos/base/allocator/CCAllocatorStrategyDefault.h +++ b/cocos/base/allocator/CCAllocatorStrategyDefault.h @@ -25,7 +25,7 @@ #ifndef CC_ALLOCATOR_STRATEGY_DEFAULT_H #define CC_ALLOCATOR_STRATEGY_DEFAULT_H -/// @cond +/// @cond DO_NOT_SHOW #include "base/allocator/CCAllocatorMacros.h" #include "base/allocator/CCAllocatorBase.h" @@ -56,5 +56,4 @@ NS_CC_ALLOCATOR_END NS_CC_END /// @endcond - #endif//CC_ALLOCATOR_STRATEGY_DEFAULT_H diff --git a/cocos/base/allocator/CCAllocatorStrategyFixedBlock.h b/cocos/base/allocator/CCAllocatorStrategyFixedBlock.h index 076d0277ed..8bc111c6ee 100644 --- a/cocos/base/allocator/CCAllocatorStrategyFixedBlock.h +++ b/cocos/base/allocator/CCAllocatorStrategyFixedBlock.h @@ -25,7 +25,7 @@ #ifndef CC_ALLOCATOR_STRATEGY_FIXED_BLOCK_H #define CC_ALLOCATOR_STRATEGY_FIXED_BLOCK_H -/// @cond +/// @cond DO_NOT_SHOW /**************************************************************************** WARNING! @@ -274,5 +274,4 @@ NS_CC_ALLOCATOR_END NS_CC_END /// @endcond - #endif//CC_ALLOCATOR_STRATEGY_FIXED_BLOCK_H diff --git a/cocos/base/allocator/CCAllocatorStrategyGlobalSmallBlock.h b/cocos/base/allocator/CCAllocatorStrategyGlobalSmallBlock.h index a460ce20af..4be9cdfc48 100644 --- a/cocos/base/allocator/CCAllocatorStrategyGlobalSmallBlock.h +++ b/cocos/base/allocator/CCAllocatorStrategyGlobalSmallBlock.h @@ -25,7 +25,7 @@ #ifndef CC_ALLOCATOR_STRATEGY_GLOBAL_SMALL_BLOCK_H #define CC_ALLOCATOR_STRATEGY_GLOBAL_SMALL_BLOCK_H -/// @cond +/// @cond DO_NOT_SHOW /**************************************************************************** WARNING! @@ -316,5 +316,4 @@ NS_CC_ALLOCATOR_END NS_CC_END /// @endcond - #endif//CC_ALLOCATOR_STRATEGY_GLOBAL_SMALL_BLOCK_H diff --git a/cocos/base/allocator/CCAllocatorStrategyPool.h b/cocos/base/allocator/CCAllocatorStrategyPool.h index 6651633292..44b66de7f0 100644 --- a/cocos/base/allocator/CCAllocatorStrategyPool.h +++ b/cocos/base/allocator/CCAllocatorStrategyPool.h @@ -25,7 +25,7 @@ #ifndef CC_ALLOCATOR_STRATEGY_POOL_H #define CC_ALLOCATOR_STRATEGY_POOL_H -/// @cond +/// @cond DO_NOT_SHOW #include #include @@ -169,5 +169,4 @@ NS_CC_ALLOCATOR_END NS_CC_END /// @endcond - #endif//CC_ALLOCATOR_STRATEGY_POOL_H diff --git a/cocos/base/atitc.h b/cocos/base/atitc.h index 77fdf1ebb5..3ef8ae5b5a 100644 --- a/cocos/base/atitc.h +++ b/cocos/base/atitc.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2013 Chukong Technologies Inc. + Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,9 +22,9 @@ THE SOFTWARE. ****************************************************************************/ - #ifndef COCOS2DX_PLATFORM_THIRDPARTY_ATITC_ #define COCOS2DX_PLATFORM_THIRDPARTY_ATITC_ +/// @cond DO_NOT_SHOW #include "platform/CCStdC.h" @@ -43,6 +43,5 @@ void atitc_decode(uint8_t *encode_data, ATITCDecodeFlag decodeFlag ); - +/// @endcond #endif /* defined(COCOS2DX_PLATFORM_THIRDPARTY_ATITC_) */ - diff --git a/cocos/base/base64.h b/cocos/base/base64.h index 2e0d9e7b51..8ee97f5605 100644 --- a/cocos/base/base64.h +++ b/cocos/base/base64.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,7 @@ THE SOFTWARE. #ifndef __SUPPORT_BASE64_H__ #define __SUPPORT_BASE64_H__ +/// @cond DO_NOT_SHOW #include "platform/CCPlatformMacros.h" @@ -64,4 +65,5 @@ int CC_DLL base64Encode(const unsigned char *in, unsigned int inLength, char **o } #endif +/// @endcond #endif // __SUPPORT_BASE64_H__ diff --git a/cocos/base/ccCArray.h b/cocos/base/ccCArray.h index 4d0dddaf08..4bf1fb4584 100644 --- a/cocos/base/ccCArray.h +++ b/cocos/base/ccCArray.h @@ -1,7 +1,7 @@ /**************************************************************************** Copyright (c) 2007 Scott Lembcke Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -42,6 +42,7 @@ THE SOFTWARE. #ifndef CC_ARRAY_H #define CC_ARRAY_H +/// @cond DO_NOT_SHOW #include "base/ccMacros.h" #include "base/CCRef.h" @@ -203,4 +204,5 @@ void ccCArrayFullRemoveArray(ccCArray *arr, ccCArray *minusArr); NS_CC_END +/// @endcond #endif // CC_ARRAY_H diff --git a/cocos/base/ccFPSImages.h b/cocos/base/ccFPSImages.h index 02fd5a83dd..9e0c96eaf7 100644 --- a/cocos/base/ccFPSImages.h +++ b/cocos/base/ccFPSImages.h @@ -1,29 +1,31 @@ -/* - * cocos2d for iPhone: http://www.cocos2d-iphone.org - * - * Copyright (c) 2012 Zynga Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ +/**************************************************************************** +Copyright (c) 2012 Zynga Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ #ifndef __BASE_CCFPSIMAGES__H #define __BASE_CCFPSIMAGES__H +/// @cond DO_NOT_SHOW #ifdef __cplusplus extern "C" { @@ -36,4 +38,5 @@ unsigned int cc_fps_images_len(void); } #endif +/// @endcond #endif // __BASE_CCFPSIMAGES__H diff --git a/cocos/base/etc1.h b/cocos/base/etc1.h index 0d389052b7..c6faf177e0 100644 --- a/cocos/base/etc1.h +++ b/cocos/base/etc1.h @@ -14,6 +14,7 @@ #ifndef __etc1_h__ #define __etc1_h__ +/// @cond DO_NOT_SHOW #define ETC1_ENCODED_BLOCK_SIZE 8 #define ETC1_DECODED_BLOCK_SIZE 48 @@ -103,4 +104,5 @@ etc1_uint32 etc1_pkm_get_height(const etc1_byte* pHeader); } #endif +/// @endcond #endif diff --git a/cocos/base/firePngData.h b/cocos/base/firePngData.h index 8c5f220915..aa8e6ced8c 100644 --- a/cocos/base/firePngData.h +++ b/cocos/base/firePngData.h @@ -1,3 +1,5 @@ +/// @cond DO_NOT_SHOW + const unsigned char __firePngData[] = { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7A, 0x7A, @@ -46,3 +48,5 @@ const unsigned char __firePngData[] = { 0x72, 0x89, 0x08, 0x10, 0x07, 0x7D, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82 }; + +/// @endcond diff --git a/cocos/base/s3tc.h b/cocos/base/s3tc.h index 1c3638e353..a9f2286040 100644 --- a/cocos/base/s3tc.h +++ b/cocos/base/s3tc.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies + Copyright (c) 2013-2015 Chukong Technologies http://www.cocos2d-x.org @@ -22,9 +22,9 @@ THE SOFTWARE. ****************************************************************************/ - #ifndef COCOS2DX_PLATFORM_THIRDPARTY_S3TC_ #define COCOS2DX_PLATFORM_THIRDPARTY_S3TC_ +/// @cond DO_NOT_SHOW #include "platform/CCStdC.h" @@ -43,6 +43,5 @@ enum class S3TCDecodeFlag S3TCDecodeFlag decodeFlag ); - + /// @endcond #endif /* defined(COCOS2DX_PLATFORM_THIRDPARTY_S3TC_) */ - diff --git a/cocos/base/uthash.h b/cocos/base/uthash.h index 909cb0ac05..ea6dc5b366 100644 --- a/cocos/base/uthash.h +++ b/cocos/base/uthash.h @@ -23,6 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef UTHASH_H #define UTHASH_H +/// @cond DO_NOT_SHOW #include /* memcmp,strlen */ #include /* ptrdiff_t */ @@ -937,4 +938,5 @@ typedef struct UT_hash_handle { unsigned hashv; /* result of hash-fcn(key) */ } UT_hash_handle; +/// @endcond #endif /* UTHASH_H */ diff --git a/cocos/base/utlist.h b/cocos/base/utlist.h index 6bccec7ada..80286cc61a 100644 --- a/cocos/base/utlist.h +++ b/cocos/base/utlist.h @@ -23,6 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef UTLIST_H #define UTLIST_H +/// @cond DO_NOT_SHOW #define UTLIST_VERSION 1.9.8 @@ -724,5 +725,5 @@ do { } \ } while (0) \ +/// @endcond #endif /* UTLIST_H */ - diff --git a/cocos/deprecated/CCArray.h b/cocos/deprecated/CCArray.h index 1ed3a597c3..b75fd45b6a 100644 --- a/cocos/deprecated/CCArray.h +++ b/cocos/deprecated/CCArray.h @@ -1,7 +1,7 @@ /**************************************************************************** Copyright (c) 2010 ForzeField Studios S.L. http://forzefield.com Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,8 +23,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + #ifndef __CCARRAY_H__ #define __CCARRAY_H__ +/// @cond DO_NOT_SHOW #define CC_USE_ARRAY_VECTOR 0 @@ -556,4 +558,5 @@ public: NS_CC_END +/// @endcond #endif // __CCARRAY_H__ diff --git a/cocos/deprecated/CCBool.h b/cocos/deprecated/CCBool.h index 641466d8a2..cfc76776d2 100644 --- a/cocos/deprecated/CCBool.h +++ b/cocos/deprecated/CCBool.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,7 @@ Copyright (c) 2013-2014 Chukong Technologies Inc. #ifndef __CCBOOL_H__ #define __CCBOOL_H__ +/// @cond DO_NOT_SHOW #include "base/CCRef.h" #include "base/CCDataVisitor.h" @@ -69,4 +70,5 @@ private: NS_CC_END +/// @endcond #endif /* __CCBOOL_H__ */ diff --git a/cocos/deprecated/CCDeprecated.h b/cocos/deprecated/CCDeprecated.h index b1837b6d17..f2fa88eabb 100644 --- a/cocos/deprecated/CCDeprecated.h +++ b/cocos/deprecated/CCDeprecated.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2013 cocos2d-x.org - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,6 +23,8 @@ THE SOFTWARE. ****************************************************************************/ +/// @cond DO_NOT_SHOW + /** Add deprecated global functions and variables here */ @@ -1155,5 +1157,5 @@ CC_DEPRECATED_ATTRIBUTE CC_DLL Vec4* kmVec4Transform(Vec4* pOut, const Vec4* pV, NS_CC_END - +/// @endcond #endif // __COCOS2D_CCDEPRECATED_H__ diff --git a/cocos/deprecated/CCDictionary.h b/cocos/deprecated/CCDictionary.h index 5bd701c10a..f4b36ea7c7 100644 --- a/cocos/deprecated/CCDictionary.h +++ b/cocos/deprecated/CCDictionary.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2012 cocos2d-x.org - opyright (c) 2013-2014 Chukong Technologies Inc. + opyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,7 @@ THE SOFTWARE. #ifndef __CCDICTIONARY_H__ #define __CCDICTIONARY_H__ +/// @cond DO_NOT_SHOW #include "base/uthash.h" #include "base/CCRef.h" @@ -456,4 +457,5 @@ private: NS_CC_END +/// @endcond #endif /* __CCDICTIONARY_H__ */ diff --git a/cocos/deprecated/CCDouble.h b/cocos/deprecated/CCDouble.h index cb0742487c..5069f99551 100644 --- a/cocos/deprecated/CCDouble.h +++ b/cocos/deprecated/CCDouble.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies + Copyright (c) 2013-2015 Chukong Technologies http://www.cocos2d-x.org @@ -24,6 +24,7 @@ #ifndef __CCDOUBLE_H__ #define __CCDOUBLE_H__ +/// @cond DO_NOT_SHOW #include "base/CCRef.h" #include "base/CCDataVisitor.h" @@ -68,4 +69,5 @@ private: NS_CC_END +/// @endcond #endif /* __CCDOUBLE_H__ */ diff --git a/cocos/deprecated/CCFloat.h b/cocos/deprecated/CCFloat.h index f467acfbe5..e4e78e8049 100644 --- a/cocos/deprecated/CCFloat.h +++ b/cocos/deprecated/CCFloat.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies + Copyright (c) 2013-2015 Chukong Technologies http://www.cocos2d-x.org @@ -24,6 +24,7 @@ #ifndef __CCFLOAT_H__ #define __CCFLOAT_H__ +/// @cond DO_NOT_SHOW #include "base/CCRef.h" #include "base/CCDataVisitor.h" @@ -69,4 +70,5 @@ private: NS_CC_END +/// @endcond #endif /* __CCFLOAT_H__ */ diff --git a/cocos/deprecated/CCInteger.h b/cocos/deprecated/CCInteger.h index 0725f72759..aeecce26bc 100644 --- a/cocos/deprecated/CCInteger.h +++ b/cocos/deprecated/CCInteger.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies + Copyright (c) 2013-2015 Chukong Technologies http://www.cocos2d-x.org @@ -24,6 +24,7 @@ #ifndef __CCINTEGER_H__ #define __CCINTEGER_H__ +/// @cond DO_NOT_SHOW #include "base/CCRef.h" #include "base/CCConsole.h" @@ -78,4 +79,5 @@ private: NS_CC_END +/// @endcond #endif /* __CCINTEGER_H__ */ diff --git a/cocos/deprecated/CCNotificationCenter.h b/cocos/deprecated/CCNotificationCenter.h index 44b88ca17b..2bf1db86e0 100644 --- a/cocos/deprecated/CCNotificationCenter.h +++ b/cocos/deprecated/CCNotificationCenter.h @@ -1,7 +1,7 @@ /**************************************************************************** Copyright (c) 2011 Erawppa Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -26,6 +26,7 @@ THE SOFTWARE. #ifndef __CCNOTIFICATIONCENTER_H__ #define __CCNOTIFICATIONCENTER_H__ +/// @cond DO_NOT_SHOW #include "base/CCRef.h" #include "base/ccTypes.h" @@ -208,4 +209,5 @@ private: NS_CC_END +/// @endcond #endif//__CCNOTIFICATIONCENTER_H__ diff --git a/cocos/deprecated/CCSet.h b/cocos/deprecated/CCSet.h index 838f59ff20..0c5bc96291 100644 --- a/cocos/deprecated/CCSet.h +++ b/cocos/deprecated/CCSet.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies +Copyright (c) 2013-2015 Chukong Technologies http://www.cocos2d-x.org @@ -25,6 +25,7 @@ THE SOFTWARE. #ifndef __CC_SET_H__ #define __CC_SET_H__ +/// @cond DO_NOT_SHOW #include #include "base/CCRef.h" @@ -117,5 +118,5 @@ private: NS_CC_END +/// @endcond #endif // __CC_SET_H__ - diff --git a/cocos/deprecated/CCString.h b/cocos/deprecated/CCString.h index 18d2002a56..d9f1e8861a 100644 --- a/cocos/deprecated/CCString.h +++ b/cocos/deprecated/CCString.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies +Copyright (c) 2013-2015 Chukong Technologies http://www.cocos2d-x.org @@ -22,8 +22,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + #ifndef __CCSTRING_H__ #define __CCSTRING_H__ +/// @cond DO_NOT_SHOW #if (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY) #include @@ -224,4 +226,5 @@ std::string CC_DLL format(const char* format, ...) CC_FORMAT_PRINTF(1, 2); NS_CC_END +/// @endcond #endif //__CCSTRING_H__ diff --git a/cocos/network/HttpAsynConnection.h b/cocos/network/HttpAsynConnection.h index 21e7f5cd1e..1ae43c96d5 100644 --- a/cocos/network/HttpAsynConnection.h +++ b/cocos/network/HttpAsynConnection.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -21,8 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + #ifndef __HTTPASYNCONNECTION_H__ #define __HTTPASYNCONNECTION_H__ +/// @cond DO_NOT_SHOW #import #import @@ -58,5 +60,6 @@ -(void) startRequest:(NSURLRequest*)request; @end + /// @endcond #endif //__HTTPASYNCONNECTION_H__ diff --git a/cocos/network/HttpCookie.h b/cocos/network/HttpCookie.h index be57a97f1a..737035e14f 100644 --- a/cocos/network/HttpCookie.h +++ b/cocos/network/HttpCookie.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,6 +24,7 @@ #ifndef HTTP_COOKIE_H #define HTTP_COOKIE_H +/// @cond DO_NOT_SHOW struct CookiesInfo { @@ -53,4 +54,5 @@ private: std::vector _cookies; }; +/// @endcond #endif /* HTTP_COOKIE_H */ diff --git a/cocos/platform/CCApplication.h b/cocos/platform/CCApplication.h index 4581bdaaf8..56bee474fd 100644 --- a/cocos/platform/CCApplication.h +++ b/cocos/platform/CCApplication.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,7 @@ THE SOFTWARE. #ifndef __PLATFORM_CCAPPLICATION_H__ #define __PLATFORM_CCAPPLICATION_H__ +/// @cond DO_NOT_SHOW #include "platform/CCPlatformConfig.h" @@ -42,4 +43,5 @@ THE SOFTWARE. #include "platform/linux/CCApplication-linux.h" #endif +/// @endcond #endif /* __PLATFORM_CCAPPLICATION_H__*/ diff --git a/cocos/platform/CCCommon.h b/cocos/platform/CCCommon.h index b2707d2e8b..cf269f7908 100644 --- a/cocos/platform/CCCommon.h +++ b/cocos/platform/CCCommon.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,7 @@ THE SOFTWARE. #ifndef __CC_COMMON_H__ #define __CC_COMMON_H__ +/// @cond DO_NOT_SHOW #include "platform/CCPlatformMacros.h" @@ -76,4 +77,5 @@ enum class LanguageType NS_CC_END +/// @cond DO_NOT_SHOW #endif // __CC_COMMON_H__ diff --git a/cocos/platform/CCGL.h b/cocos/platform/CCGL.h index 141f3639bf..e42f7128f4 100644 --- a/cocos/platform/CCGL.h +++ b/cocos/platform/CCGL.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,7 @@ THE SOFTWARE. #ifndef __PLATFORM_CCGL_H__ #define __PLATFORM_CCGL_H__ +/// @cond DO_NOT_SHOW #include "platform/CCPlatformConfig.h" @@ -42,4 +43,5 @@ THE SOFTWARE. #include "platform/linux/CCGL-linux.h" #endif +/// @endcond #endif /* __PLATFORM_CCPLATFORMDEFINE_H__*/ diff --git a/cocos/platform/CCImage.h b/cocos/platform/CCImage.h index c2883c1cbf..6abedd5c57 100644 --- a/cocos/platform/CCImage.h +++ b/cocos/platform/CCImage.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,7 @@ THE SOFTWARE. #ifndef __CC_IMAGE_H__ #define __CC_IMAGE_H__ +/// @cond DO_NOT_SHOW #include "base/CCRef.h" #include "renderer/CCTexture2D.h" @@ -217,4 +218,5 @@ protected: NS_CC_END +/// @endcond #endif // __CC_IMAGE_H__ diff --git a/cocos/platform/CCPlatformConfig.h b/cocos/platform/CCPlatformConfig.h index dee092326c..caceecb548 100644 --- a/cocos/platform/CCPlatformConfig.h +++ b/cocos/platform/CCPlatformConfig.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies +Copyright (c) 2013-2015 Chukong Technologies http://www.cocos2d-x.org @@ -25,6 +25,7 @@ THE SOFTWARE. #ifndef __BASE_CC_PLATFORM_CONFIG_H__ #define __BASE_CC_PLATFORM_CONFIG_H__ +/// @cond DO_NOT_SHOW /** Config of cocos2d-x project, per target platform. @@ -156,5 +157,5 @@ THE SOFTWARE. #endif #endif // CC_PLATFORM_WIN32 +/// @endcond #endif // __BASE_CC_PLATFORM_CONFIG_H__ - diff --git a/cocos/platform/CCPlatformDefine.h b/cocos/platform/CCPlatformDefine.h index 4a581ddb8a..fd366cdccf 100644 --- a/cocos/platform/CCPlatformDefine.h +++ b/cocos/platform/CCPlatformDefine.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,7 @@ THE SOFTWARE. #ifndef __PLATFORM_CCPLATFORMDEFINE_H__ #define __PLATFORM_CCPLATFORMDEFINE_H__ +/// @cond DO_NOT_SHOW #include "platform/CCPlatformConfig.h" @@ -42,4 +43,5 @@ THE SOFTWARE. #include "platform/linux/CCPlatformDefine-linux.h" #endif +/// @cond DO_NOT_SHOW #endif /* __PLATFORM_CCPLATFORMDEFINE_H__*/ diff --git a/cocos/platform/CCPlatformMacros.h b/cocos/platform/CCPlatformMacros.h index 8a50b7a5ba..7e9964e0a0 100644 --- a/cocos/platform/CCPlatformMacros.h +++ b/cocos/platform/CCPlatformMacros.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies +Copyright (c) 2013-2015 Chukong Technologies http://www.cocos2d-x.org @@ -22,8 +22,10 @@ Copyright (c) 2013-2014 Chukong Technologies OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + #ifndef __CC_PLATFORM_MACROS_H__ #define __CC_PLATFORM_MACROS_H__ +/// @cond DO_NOT_SHOW /** * define some platform specific macros @@ -318,4 +320,5 @@ public: virtual void set##funName(varType var) \ #endif #endif +/// @endcond #endif // __CC_PLATFORM_MACROS_H__ diff --git a/cocos/platform/CCSAXParser.h b/cocos/platform/CCSAXParser.h index 222affb538..bc2cfa3317 100644 --- a/cocos/platform/CCSAXParser.h +++ b/cocos/platform/CCSAXParser.h @@ -23,6 +23,7 @@ #ifndef __CCSAXPARSER_H__ #define __CCSAXPARSER_H__ +/// @cond DO_NOT_SHOW #include "platform/CCPlatformConfig.h" #include "platform/CCCommon.h" @@ -115,4 +116,5 @@ public: NS_CC_END +/// @endcond #endif //__CCSAXPARSER_H__ diff --git a/cocos/platform/CCStdC.h b/cocos/platform/CCStdC.h index 8700aec3c0..e821fa1a3a 100644 --- a/cocos/platform/CCStdC.h +++ b/cocos/platform/CCStdC.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org diff --git a/cocos/platform/CCThread.h b/cocos/platform/CCThread.h index 0598adcf97..a371eef663 100644 --- a/cocos/platform/CCThread.h +++ b/cocos/platform/CCThread.h @@ -1,6 +1,6 @@ /**************************************************************************** Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -25,6 +25,7 @@ THE SOFTWARE. #ifndef __CC_PLATFORM_THREAD_H__ #define __CC_PLATFORM_THREAD_H__ +/// @cond DO_NOT_SHOW #include "platform/CCPlatformMacros.h" @@ -61,4 +62,5 @@ public: NS_CC_END +/// @endcond #endif // __CC_PLATFORM_THREAD_H__ diff --git a/cocos/renderer/CCRenderCommandPool.h b/cocos/renderer/CCRenderCommandPool.h index 157ff8c2c3..15d04228e1 100644 --- a/cocos/renderer/CCRenderCommandPool.h +++ b/cocos/renderer/CCRenderCommandPool.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,9 +22,9 @@ THE SOFTWARE. ****************************************************************************/ - #ifndef __CC_RENDERCOMMANDPOOL_H__ #define __CC_RENDERCOMMANDPOOL_H__ +/// @cond DO_NOT_SHOW #include @@ -98,4 +98,5 @@ private: NS_CC_END +/// @endcond #endif diff --git a/cocos/renderer/ccShaders.h b/cocos/renderer/ccShaders.h index eaea82f202..74b11bb09b 100644 --- a/cocos/renderer/ccShaders.h +++ b/cocos/renderer/ccShaders.h @@ -1,7 +1,7 @@ /**************************************************************************** Copyright (c) 2011 Zynga Inc. Copyright (c) 2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. +Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -23,8 +23,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + #ifndef __CCSHADER_H__ #define __CCSHADER_H__ +/// @cond DO_NOT_SHOW #include "platform/CCGL.h" #include "platform/CCPlatformMacros.h" @@ -87,4 +89,5 @@ extern CC_DLL const GLchar * cc3D_Particle_color_frag; NS_CC_END +/// @endcond #endif /* __CCSHADER_H__ */ diff --git a/cocos/ui/UIDeprecated.h b/cocos/ui/UIDeprecated.h index 508322d061..14686a7093 100644 --- a/cocos/ui/UIDeprecated.h +++ b/cocos/ui/UIDeprecated.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2013-2014 Chukong Technologies Inc. + Copyright (c) 2013-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,6 +24,7 @@ #ifndef cocos2d_libs_UIDeprecated_h #define cocos2d_libs_UIDeprecated_h +/// @cond DO_NOT_SHOW #include "platform/CCPlatformMacros.h" #include "ui/UIWidget.h" @@ -161,4 +162,5 @@ CC_DEPRECATED_ATTRIBUTE extern const Margin MarginZero; NS_CC_END +/// @endcond #endif diff --git a/cocos/ui/UIWebView-inl.h b/cocos/ui/UIWebView-inl.h index 326558e704..7edb3c5420 100644 --- a/cocos/ui/UIWebView-inl.h +++ b/cocos/ui/UIWebView-inl.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (c) 2014-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -22,14 +22,13 @@ THE SOFTWARE. ****************************************************************************/ +/// @cond DO_NOT_SHOW #include "UIWebView.h" #include "platform/CCGLView.h" #include "base/CCDirector.h" #include "platform/CCFileUtils.h" - - NS_CC_BEGIN namespace experimental{ namespace ui{ @@ -202,3 +201,4 @@ namespace experimental{ } // namespace experimental } //namespace cocos2d +/// @endcond diff --git a/cocos/ui/UIWebViewImpl-android.h b/cocos/ui/UIWebViewImpl-android.h index 3e6c875b46..1f0567a953 100644 --- a/cocos/ui/UIWebViewImpl-android.h +++ b/cocos/ui/UIWebViewImpl-android.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (c) 2014-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,6 +24,7 @@ #ifndef __COCOS2D__UI__WEBVIEWIMPL_ANDROID_H_ #define __COCOS2D__UI__WEBVIEWIMPL_ANDROID_H_ +/// @cond DO_NOT_SHOW #ifdef __ANDROID__ @@ -97,4 +98,5 @@ namespace cocos2d { #endif // __ANDROID__ +/// @endcond #endif /* __COCOS2D__UI__WEBVIEWIMPL_ANDROID_H_ */ diff --git a/cocos/ui/UIWebViewImpl-ios.h b/cocos/ui/UIWebViewImpl-ios.h index 6d65a83f52..00a993c159 100644 --- a/cocos/ui/UIWebViewImpl-ios.h +++ b/cocos/ui/UIWebViewImpl-ios.h @@ -1,5 +1,5 @@ /**************************************************************************** - Copyright (c) 2014 Chukong Technologies Inc. + Copyright (c) 2014-2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -24,6 +24,7 @@ #ifndef __COCOS2D_UI_WEBVIEWIMPL_IOS_H_ #define __COCOS2D_UI_WEBVIEWIMPL_IOS_H_ +/// @cond DO_NOT_SHOW #include @@ -88,4 +89,5 @@ private: } // namespace experimental }//namespace cocos2d +/// @endcond #endif /* __COCOS2D_UI_WEBVIEWIMPL_IOS_H_ */