Remove the NS_AX_BEGIN and NS_AX_END macros. (axmolengine#2100)

core/2d/Action.cpp

@@ -33,7 +33,8 @@ THE SOFTWARE.
 #include "base/Director.h"
 #include "base/UTF8.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 //
 // Action Base Class
 //
@@ -298,4 +299,4 @@ void Follow::stop()
     Action::stop();
 }
 
-NS_AX_END
+}

core/2d/Action.h

@@ -33,7 +33,8 @@ THE SOFTWARE.
 #include "math/Math.h"
 #include "base/ScriptSupport.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 
 class Node;
 
@@ -445,6 +446,6 @@ class AX_DLL Follow : public Action
 // end of actions group
 /// @}
 
-NS_AX_END
+}
 
 #endif  // __ACTIONS_CCACTION_H__

core/2d/ActionCamera.cpp

@@ -30,7 +30,8 @@ THE SOFTWARE.
 #include "2d/Node.h"
 #include "platform/StdC.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 //
 // CameraAction
 //
@@ -242,4 +243,4 @@ void OrbitCamera::sphericalRadius(float* newRadius, float* zenith, float* azimut
     *newRadius = r / FLT_EPSILON;
 }
 
-NS_AX_END
+}

core/2d/ActionCamera.h

@@ -32,7 +32,8 @@ THE SOFTWARE.
 #include "2d/ActionInterval.h"
 #include "math/Math.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 
 class Camera;
 
@@ -183,6 +184,6 @@ class AX_DLL OrbitCamera : public ActionCamera
 // end of actions group
 /// @}
 
-NS_AX_END
+}
 
 #endif  //__CCCAMERA_ACTION_H__

core/2d/ActionCatmullRom.cpp

@@ -40,7 +40,8 @@
 
 using namespace std;
 
-NS_AX_BEGIN;
+namespace ax
+{
 
 /*
  *  Implementation of PointArray
@@ -508,4 +509,4 @@ CatmullRomBy* CatmullRomBy::reverse() const
     return CatmullRomBy::create(_duration, reverse);
 }
 
-NS_AX_END;
+}

core/2d/ActionCatmullRom.h

@@ -42,7 +42,8 @@
 #include "2d/ActionInterval.h"
 #include "math/Math.h"
 
-NS_AX_BEGIN;
+namespace ax
+{
 
 class Node;
 
@@ -341,6 +342,6 @@ ccCardinalSplineAt(const Vec2& p0, const Vec2& p1, const Vec2& p2, const Vec2& p
 // end of actions group
 /// @}
 
-NS_AX_END;
+}
 
 #endif  // __CCACTION_CATMULLROM_H__

core/2d/ActionCoroutine.cpp

@@ -29,7 +29,8 @@ THE SOFTWARE.
 
 #include "ActionCoroutine.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 
 //
 // Coroutine
@@ -118,4 +119,4 @@ void ActionCoroutine::step(float dt)
     _coroutine.moveNext();
 }
 
-NS_AX_END
+}

core/2d/ActionCoroutine.h

@@ -54,7 +54,8 @@ using coroutine_handle = std::experimental::coroutine_handle<_Ty>;
 #    error This compiler missing c++20 coroutine
 #endif
 
-NS_AX_BEGIN
+namespace ax
+{
 
 /**
  * @addtogroup actions
@@ -153,6 +154,6 @@ class AX_DLL ActionCoroutine : public Action
     AX_DISALLOW_COPY_AND_ASSIGN(ActionCoroutine);
 };
 
-NS_AX_END
+}
 
 #endif  // __ACTION_CCCOROUTINE_ACTION_H__

core/2d/ActionEase.cpp

@@ -36,7 +36,8 @@ THE SOFTWARE.
 #include "2d/ActionEase.h"
 #include "2d/TweenFunction.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 
 #ifndef M_PI_X_2
 #    define M_PI_X_2 (float)M_PI * 2.0f
@@ -305,4 +306,4 @@ EaseBezierAction* EaseBezierAction::reverse() const
     return reverseAction;
 }
 
-NS_AX_END
+}

core/2d/ActionEase.h

@@ -32,7 +32,8 @@ THE SOFTWARE.
 #include "2d/ActionInterval.h"
 #include "2d/TweenFunction.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 
 /**
  * @addtogroup actions
@@ -552,6 +553,6 @@ class AX_DLL EaseBezierAction : public ax::ActionEase
 // end of actions group
 /// @}
 
-NS_AX_END
+}
 
 #endif  // __ACTION_CCEASE_ACTION_H__

core/2d/ActionGrid.cpp

@@ -31,7 +31,8 @@ THE SOFTWARE.
 #include "2d/NodeGrid.h"
 #include "base/Director.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 // implementation of GridAction
 
 bool GridAction::initWithDuration(float duration, const Vec2& gridSize)
@@ -446,4 +447,4 @@ ReuseGrid* ReuseGrid::reverse() const
     return this->clone();
 }
 
-NS_AX_END
+}

core/2d/ActionGrid.h

@@ -30,7 +30,8 @@ THE SOFTWARE.
 #include "2d/ActionInterval.h"
 #include "2d/ActionInstant.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 
 class GridBase;
 class NodeGrid;
@@ -408,6 +409,6 @@ class AX_DLL ReuseGrid : public ActionInstant
 // end of actions group
 /// @}
 
-NS_AX_END
+}
 
 #endif  // __ACTION_CCGRID_ACTION_H__

core/2d/ActionGrid3D.cpp

@@ -28,7 +28,8 @@ THE SOFTWARE.
 #include "2d/ActionGrid3D.h"
 #include "base/Director.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 // implementation of Waves3D
 
 Waves3D* Waves3D::create(float duration, const Vec2& gridSize, unsigned int waves, float amplitude)
@@ -736,4 +737,4 @@ void Twirl::update(float time)
     }
 }
 
-NS_AX_END
+}

core/2d/ActionGrid3D.h

@@ -30,7 +30,8 @@ THE SOFTWARE.
 
 #include "2d/ActionGrid.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 
 /**
  * @addtogroup actions
@@ -635,6 +636,6 @@ class AX_DLL Twirl : public Grid3DAction
 // end of actions group
 /// @}
 
-NS_AX_END
+}
 
 #endif  // __ACTION_CCGRID3D_ACTION_H__

core/2d/ActionInstant.cpp

@@ -30,7 +30,8 @@
 #include "2d/Node.h"
 #include "2d/Sprite.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 //
 // InstantAction
 //
@@ -399,4 +400,4 @@ CallFuncN* CallFuncN::clone() const
     return a;
 }
 
-NS_AX_END
+}

core/2d/ActionInstant.h

@@ -32,7 +32,8 @@ THE SOFTWARE.
 #include <functional>
 #include "2d/Action.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 
 /**
  * @addtogroup actions
@@ -395,6 +396,6 @@ class AX_DLL CallFuncN : public CallFunc
 // end of actions group
 /// @}
 
-NS_AX_END
+}
 
 #endif  //__CCINSTANT_ACTION_H__

core/2d/ActionInterval.cpp

@@ -41,7 +41,8 @@ THE SOFTWARE.
 #include "platform/StdC.h"
 #include "base/ScriptSupport.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 
 // Extra action for making a Sequence or Spawn when only adding one action to it.
 class ExtraAction : public FiniteTimeAction
@@ -2765,4 +2766,4 @@ ActionFloat* ActionFloat::reverse() const
     return ActionFloat::create(_duration, _to, _from, _callback);
 }
 
-NS_AX_END
+}

core/2d/ActionInterval.h

@@ -37,7 +37,8 @@ THE SOFTWARE.
 #include "base/Protocols.h"
 #include "base/Vector.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 
 class Node;
 class SpriteFrame;
@@ -1617,6 +1618,6 @@ class AX_DLL ActionFloat : public ActionInterval
 // end of actions group
 /// @}
 
-NS_AX_END
+}
 
 #endif  //__ACTION_CCINTERVAL_ACTION_H__

core/2d/ActionManager.cpp

@@ -34,7 +34,8 @@ THE SOFTWARE.
 #include "base/Scheduler.h"
 #include "base/Macros.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 //
 // singleton stuff
 //
@@ -453,4 +454,4 @@ void ActionManager::update(float dt)
     _currentTarget = nullptr;
 }
 
-NS_AX_END
+}

core/2d/ActionManager.h

@@ -35,7 +35,8 @@ THE SOFTWARE.
 #include "base/Vector.h"
 #include "base/Object.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 
 struct ActionHandle
 {
@@ -220,6 +221,6 @@ class AX_DLL ActionManager : public Object
 // end of actions group
 /// @}
 
-NS_AX_END
+}
 
 #endif  // __ACTION_CCACTION_MANAGER_H__

core/2d/ActionPageTurn3D.cpp

@@ -28,7 +28,8 @@ THE SOFTWARE.
 #include "2d/Grid.h"
 #include "2d/NodeGrid.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 
 PageTurn3D* PageTurn3D::create(float duration, const Vec2& gridSize)
 {
@@ -130,4 +131,4 @@ void PageTurn3D::update(float time)
     }
 }
 
-NS_AX_END
+}

core/2d/ActionPageTurn3D.h

@@ -29,7 +29,8 @@ THE SOFTWARE.
 
 #include "2d/ActionGrid3D.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 
 /**
  * @addtogroup actions
@@ -69,6 +70,6 @@ class AX_DLL PageTurn3D : public Grid3DAction
 // end of actions group
 /// @}
 
-NS_AX_END
+}
 
 #endif  // __ACTION_CCPAGETURN3D_ACTION_H__

core/2d/ActionProgressTimer.cpp

@@ -27,7 +27,8 @@ THE SOFTWARE.
 #include "2d/ActionProgressTimer.h"
 #include "2d/ProgressTimer.h"
 
-NS_AX_BEGIN
+namespace ax
+{
 
 #define kProgressTimerCast ProgressTimer*
 
@@ -130,4 +131,4 @@ void ProgressFromTo::update(float time)
     ((kProgressTimerCast)(_target))->setPercentage(_from + (_to - _from) * time);
 }
 
-NS_AX_END
+}