Remove the USING_NS_AX and NS_AX macros. (#2103)

core/3d/Terrain.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 
 #include "3d/Terrain.h"
 
-USING_NS_AX;
+using namespace ax;
 #include <stdlib.h>
 #include <float.h>
 #include <set>

core/base/Config.h

@@ -347,10 +347,8 @@ THE SOFTWARE.
 /// @{
 #ifdef __cplusplus
 #    define USING_NS_AX using namespace ax
-#    define NS_AX ::ax
 #else
 #    define USING_NS_AX
-#    define NS_AX
 #endif
 
 namespace ax

core/base/Properties.cpp

@@ -35,7 +35,7 @@
 #include "base/UTF8.h"
 #include "base/Data.h"
 
-USING_NS_AX;
+using namespace ax;
 
 // Utility functions (shared with SceneLoader).
 /** @script{ignore} */

core/cocos2d.h

@@ -53,8 +53,6 @@ using Ref                   = Object;
 
 namespace cocos2d = ax;
 
-#define USING_NS_CC                  USING_NS_AX
-
 #define CC_SAFE_RELEASE              AX_SAFE_RELEASE
 #define CC_SAFE_RELEASE_NULL         AX_SAFE_RELEASE_NULL
 #define CC_SAFE_DELETE               AX_SAFE_DELETE

core/media/AvfMediaEngine.mm

@@ -37,7 +37,7 @@
 #    import <UIKit/UIKit.h>
 #endif
 
-USING_NS_AX;
+using namespace ax;
 
 #define AX_ALIGN_ANY(x, a) ((((x) + (a) - 1) / (a)) * (a))
 

core/media/MediaEngine.h

@@ -33,7 +33,6 @@
 #    define AX_BREAK_IF(cond) \
         if (cond)             \
         break
-#    define USING_NS_AX using namespace ax
 #endif
 
 // #define AXME_USE_IMFME 1

core/platform/android/javaactivity-android.cpp

@@ -43,7 +43,7 @@ THE SOFTWARE.
 
 void axmol_android_app_init(JNIEnv* env) __attribute__((weak));
 
-USING_NS_AX;
+using namespace ax;
 
 extern "C" {
 

core/platform/android/jni/Java_org_axmol_lib_AxmolAccelerometer.cpp

@@ -30,7 +30,7 @@
 
 #define TG3_GRAVITY_EARTH (9.80665f)
 
-USING_NS_AX;
+using namespace ax;
 
 extern "C" {
 JNIEXPORT void JNICALL Java_org_axmol_lib_AxmolAccelerometer_onSensorChanged(JNIEnv*,

core/platform/android/jni/Java_org_axmol_lib_AxmolEngine.cpp

@@ -44,7 +44,7 @@ static void* s_ctx                         = nullptr;
 
 static std::string g_apkPath;
 
-USING_NS_AX;
+using namespace ax;
 using namespace std;
 
 extern "C" {

core/platform/android/jni/Java_org_axmol_lib_AxmolRenderer.cpp

@@ -34,7 +34,7 @@
 
 #include "base/UTF8.h"
 
-USING_NS_AX;
+using namespace ax;
 
 extern "C" {
 

core/platform/android/jni/Java_org_axmol_lib_BitmapHelper.cpp

@@ -33,7 +33,7 @@ THE SOFTWARE.
 
 static const char* className = "org.axmol.lib.BitmapHelper";
 
-USING_NS_AX;
+using namespace ax;
 
 int getFontSizeAccordingHeightJni(int height)
 {

core/platform/android/jni/TouchesJni.cpp

@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include <android/log.h>
 #include <jni.h>
 
-USING_NS_AX;
+using namespace ax;
 
 extern "C" {
 JNIEXPORT void JNICALL

core/ui/LayoutHelper.cpp

@@ -4,7 +4,7 @@
 //
 #include "ui/LayoutHelper.h"
 
-USING_NS_AX;
+using namespace ax;
 
 Vec2 LayoutHelper::s_designSize;
 float LayoutHelper::s_adjustedScale = 1.0f;

core/ui/LayoutHelper.h

@@ -33,7 +33,7 @@
 
 #    define center_coord(__SZ__, __sz__, __achor__) (((__SZ__) - (__sz__) + 2 * (__sz__) * (__achor__)) * 0.5f)
 
-USING_NS_AX;
+using namespace ax;
 
 // inline Vec2 operator*(const Vec2& left, const ax::Vec2& right)
 //{

core/ui/UIMediaPlayer.cpp

@@ -42,7 +42,7 @@
 #    include "yasio/byte_buffer.hpp"
 //-----------------------------------------------------------------------------------------------------------
 
-USING_NS_AX;
+using namespace ax;
 
 //-----------------------------------------------------------------------------------------------------------
 

core/ui/UIRichText.cpp

@@ -45,7 +45,7 @@
 
 #include "platform/SAXParser.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ax::ui;
 
 class UrlTouchListenerComponent : public Component

core/ui/UIWebView/UIWebViewCommon.h

@@ -31,7 +31,7 @@
 
 namespace webview_common
 {
-USING_NS_AX;
+using namespace ax;
 using namespace rapidjson;
 
 inline std::string htmlFromUri(std::string_view s)

core/ui/UIWebView/UIWebViewImpl-win32.cpp

@@ -58,7 +58,7 @@
 
 #    include "ntcvt/ntcvt.hpp"
 
-USING_NS_AX;
+using namespace ax;
 using namespace webview_common;
 
 using msg_cb_t = std::function<void(std::string_view)>;

docs/Doxyfile.in

@@ -2399,7 +2399,6 @@ PREDEFINED             = "AX_PROPERTY_READONLY(varType, varName, funName)=protec
                          "NS_AX_MATH_END=}" \
                          "NS_AX_BACKEND_BEGIN=namespace ax { namespace backend{" \
                          "NS_AX_BACKEND_BEGIN=}}" \
-                         "USING_NS_AX=using namespace ax" \
                          "USING_NS_AX_MATH=using namespace ax" \
                          "NS_AX_EXT_BEGIN=namespace ax { namespace extension {" \
                          "NS_AX_EXT_END=}}" \

extensions/ImGui/src/ImGui/README.md

@@ -16,7 +16,7 @@ to use those with specific font.
 ## How to use
 ```cpp
 #include "ImGui/ImGuiPresenter.h"
-USING_NS_AX;
+using namespace ax;
 USING_NS_AX_EXT;
 
 class GameScene : public Scene {

extensions/ImGui/src/ImGui/imgui_impl_ax.cpp

@@ -83,7 +83,7 @@
 #include "renderer/backend/opengl/OpenGLState.h"
 #endif
 
-USING_NS_AX;
+using namespace ax;
 using namespace backend;
 
 // Clang warnings with -Weverything

extensions/ImGui/src/ImGui/imgui_impl_ax_android.cpp

@@ -9,7 +9,7 @@
 #include <imgui_internal.h>
 #include "base/IMEDelegate.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace backend;
 
 // Clang warnings with -Weverything

extensions/Live2D/Framework/src/Rendering/axmol/CubismCommandBuffer_Cocos2dx.hpp

@@ -36,7 +36,7 @@
 
 #include "renderer/backend/Texture.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace Live2D { namespace Cubism { namespace Framework { namespace Rendering {
 

extensions/Live2D/Framework/src/Rendering/axmol/CubismOffscreenSurface_Cocos2dx.hpp

@@ -40,7 +40,7 @@
 
 #include "renderer/backend/RenderTarget.h"
 
-USING_NS_AX;
+using namespace ax;
 
 //------------ LIVE2D NAMESPACE ------------
 namespace Live2D { namespace Cubism { namespace Framework { namespace Rendering {

extensions/Live2D/Framework/src/Rendering/axmol/CubismRenderer_Cocos2dx.cpp

@@ -12,7 +12,7 @@
 #include <float.h>
 #include "renderer/backend/DriverBase.h"
 
-USING_NS_AX;
+using namespace ax;
 
 #ifdef CSM_TARGET_WIN_GL
 #include <Windows.h>

extensions/Live2D/Framework/src/Rendering/axmol/CubismRenderer_Cocos2dx.hpp

@@ -41,7 +41,7 @@
 #include <OpenGL/gl.h>
 #endif
 
-USING_NS_AX;
+using namespace ax;
 
 //------------ LIVE2D NAMESPACE ------------
 namespace Live2D { namespace Cubism { namespace Framework { namespace Rendering {

extensions/assets-manager/src/assets-manager/AssetsManager.cpp

@@ -42,7 +42,7 @@
 NS_AX_EXT_BEGIN
 
 using namespace std;
-USING_NS_AX;
+using namespace ax;
 using namespace ax::network;
 
 #define KEY_OF_VERSION "current-version-code"

extensions/cocostudio/src/cocostudio/ActionFrame.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #include "ActionFrame.h"
 #include "2d/ActionEase.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/ActionManagerEx.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #include "ActionManagerEx.h"
 #include "CocoLoader.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/ActionNode.cpp

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "base/Utils.h"
 #include "ActionManagerEx.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/ActionObject.cpp

@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include "2d/ActionInstant.h"
 #include "base/Utils.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/ActionTimeline/ActionTimeline.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 
 #include "cocostudio/ComExtensionData.h"
 
-USING_NS_AX;
+using namespace ax;
 
 NS_TIMELINE_BEGIN
 

extensions/cocostudio/src/cocostudio/ActionTimeline/ActionTimelineCache.cpp

@@ -43,7 +43,7 @@ THE SOFTWARE.
 
 #include <fstream>
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/ActionTimeline/ActionTimelineNode.cpp

@@ -24,7 +24,7 @@
 
 #include "cocostudio/ActionTimeline/ActionTimelineNode.h"
 
-USING_NS_AX;
+using namespace ax;
 
 NS_TIMELINE_BEGIN
 

extensions/cocostudio/src/cocostudio/ActionTimeline/Frame.cpp

@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include <exception>
 #include <iostream>
 
-USING_NS_AX;
+using namespace ax;
 
 NS_TIMELINE_BEGIN
 

extensions/cocostudio/src/cocostudio/ActionTimeline/SkinNode.cpp

@@ -23,7 +23,7 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include "SkinNode.h"
-USING_NS_AX;
+using namespace ax;
 
 NS_TIMELINE_BEGIN
 

extensions/cocostudio/src/cocostudio/ActionTimeline/TimeLine.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #include "TimeLine.h"
 #include "ActionTimeline.h"
 
-USING_NS_AX;
+using namespace ax;
 
 NS_TIMELINE_BEGIN
 

extensions/cocostudio/src/cocostudio/Armature.cpp

@@ -40,7 +40,7 @@ THE SOFTWARE.
 #    include "chipmunk/chipmunk.h"
 #endif
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/ArmatureAnimation.cpp

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include "ArmatureDefine.h"
 #include "Datas.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/ArmatureDataManager.cpp

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include "DataReaderHelper.h"
 #include "SpriteFrameCacheHelper.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/BatchNode.cpp

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include "renderer/GroupCommand.h"
 #include "base/Director.h"
 
-USING_NS_AX;
+using namespace ax;
 namespace cocostudio
 {
 BatchNode* BatchNode::create()

extensions/cocostudio/src/cocostudio/Bone.cpp

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include "TransformHelp.h"
 #include "DisplayManager.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/ColliderDetector.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #include "Bone.h"
 #include "TransformHelp.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/ComAttribute.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #include "ComAttribute.h"
 #include "platform/FileUtils.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/ComRender.cpp

@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include "2d/ParticleSystemQuad.h"
 #include "2d/SpriteFrameCache.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/DataReaderHelper.cpp

@@ -37,7 +37,7 @@ THE SOFTWARE.
 
 #include "CocoLoader.h"
 
-USING_NS_AX;
+using namespace ax;
 
 static const char* VERSION     = "version";
 static const float VERSION_2_0 = 2.0f;

extensions/cocostudio/src/cocostudio/Datas.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #include "Datas.h"
 #include "TransformHelp.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/DecorativeDisplay.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #include "DecorativeDisplay.h"
 #include "2d/Node.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/DisplayFactory.cpp

@@ -31,7 +31,7 @@ THE SOFTWARE.
 
 #include "2d/ParticleSystemQuad.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/DisplayManager.cpp

@@ -29,7 +29,7 @@ THE SOFTWARE.
 
 #include "2d/ParticleSystemQuad.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/FlatBuffersSerialize.cpp

@@ -62,7 +62,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ax::ui;
 using namespace cocostudio;
 using namespace cocostudio::timeline;

extensions/cocostudio/src/cocostudio/InputDelegate.cpp

@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include "base/EventListenerKeyboard.h"
 #include "base/EventDispatcher.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/LocalizationManager.cpp

@@ -4,7 +4,7 @@
 #include "CSLanguageDataBinary_generated.h"
 
 using namespace cocostudio;
-USING_NS_AX;
+using namespace ax;
 
 static JsonLocalizationManager* _sharedJsonLocalizationManager = nullptr;
 

extensions/cocostudio/src/cocostudio/ProcessBase.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 #include "ProcessBase.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/SGUIReader.cpp

@@ -49,7 +49,7 @@ THE SOFTWARE.
 #include "CocoLoader.h"
 #include "pugixml/pugixml.hpp"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ax::ui;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/SSceneReader.cpp

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include "base/Utils.h"
 #include "platform/FileUtils.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/Skin.cpp

@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include "TransformHelp.h"
 #include "Armature.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/SpriteFrameCacheHelper.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 #include "2d/SpriteFrame.h"
 #include "2d/SpriteFrameCache.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/TransformHelp.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 #include "base/Director.h"
 #include "base/EventDispatcher.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/TriggerBase.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #include "TriggerBase.h"
 #include "base/EventCustom.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace cocostudio;
 
 void sendEvent(unsigned int event)

extensions/cocostudio/src/cocostudio/TriggerMng.cpp

@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include "base/Utils.h"
 #include "base/EventCustom.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/TriggerObj.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 #include "TriggerObj.h"
 #include "base/EventListenerCustom.h"
 
-USING_NS_AX;
+using namespace ax;
 
 namespace cocostudio
 {

extensions/cocostudio/src/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp

@@ -11,7 +11,7 @@
 #    include "DragonBones/CCDragonBonesHeaders.h"
 #endif
 
-USING_NS_AX;
+using namespace ax;
 using namespace cocostudio;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp

@@ -13,7 +13,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp

@@ -11,7 +11,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp

@@ -30,7 +30,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/WidgetReader/GameMapReader/GameMapReader.cpp

@@ -35,7 +35,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.cpp

@@ -35,7 +35,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp

@@ -12,7 +12,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp

@@ -15,7 +15,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp

@@ -33,7 +33,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp

@@ -11,7 +11,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp

@@ -12,7 +12,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/MeshReader/MeshReader.cpp

@@ -38,7 +38,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp

@@ -32,7 +32,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/WidgetReader/NodeReader/NodeReader.cpp

@@ -31,7 +31,7 @@
 #include "flatbuffers/flatbuffers.h"
 #include "ui/UILayoutComponent.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp

@@ -12,7 +12,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp

@@ -34,7 +34,7 @@
 
 #include "Particle3D/PU/PUParticleSystem3D.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp

@@ -33,7 +33,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp

@@ -29,7 +29,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/WidgetReader/RadioButtonReader/RadioButtonGroupReader.cpp

@@ -12,7 +12,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/RadioButtonReader/RadioButtonReader.cpp

@@ -11,7 +11,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/RichTextReader/RichTextReader.cpp

@@ -11,7 +11,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp

@@ -11,7 +11,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.cpp

@@ -30,7 +30,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.cpp

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "cocostudio/ActionTimeline/BoneNode.h"
 #include "base/Utils.h"
 
-USING_NS_AX;
+using namespace ax;
 USING_NS_TIMELINE;
 using namespace cocostudio;
 using namespace flatbuffers;

extensions/cocostudio/src/cocostudio/WidgetReader/SkeletonReader/SkeletonNodeReader.cpp

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include "SkeletonNodeReader.h"
 #include "cocostudio/ActionTimeline/SkeletonNode.h"
 
-USING_NS_AX;
+using namespace ax;
 USING_NS_TIMELINE;
 using namespace cocostudio;
 using namespace flatbuffers;

extensions/cocostudio/src/cocostudio/WidgetReader/SliderReader/SliderReader.cpp

@@ -12,7 +12,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/SpineSkeletonReader/SpineSkeletonReader.cpp

@@ -37,7 +37,7 @@
 
 #    include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp

@@ -40,7 +40,7 @@
 #include "renderer/backend/ProgramManager.h"
 #include "renderer/backend/ProgramState.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/WidgetReader/TabControlReader/TabControlReader.cpp

@@ -32,7 +32,7 @@
 #include "platform/FileUtils.h"
 #include "2d/SpriteFrameCache.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace cocostudio;
 using namespace flatbuffers;
 using namespace ax::ui;

extensions/cocostudio/src/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp

@@ -11,7 +11,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp

@@ -11,7 +11,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/TextFieldReader/TextFieldExReader.cpp

@@ -12,7 +12,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp

@@ -10,7 +10,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/TextReader/TextReader.cpp

@@ -12,7 +12,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 

extensions/cocostudio/src/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp

@@ -35,7 +35,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace flatbuffers;
 
 namespace cocostudio

extensions/cocostudio/src/cocostudio/WidgetReader/WidgetReader.cpp

@@ -14,7 +14,7 @@
 #include "base/Utils.h"
 #include "base/Director.h"
 
-USING_NS_AX;
+using namespace ax;
 using namespace ui;
 using namespace flatbuffers;
 /**/

extensions/fairygui/src/fairygui/Controller.cpp

@@ -5,7 +5,7 @@
 #include "utils/ToolSet.h"
 
 NS_FGUI_BEGIN
-USING_NS_AX;
+using namespace ax;
 
 GController::GController() : changing(false),
                              autoRadioGroupDepth(false),

extensions/fairygui/src/fairygui/DragDropManager.cpp

@@ -3,7 +3,7 @@
 #include "GRoot.h"
 
 NS_FGUI_BEGIN
-USING_NS_AX;
+using namespace ax;
 
 DragDropManager* DragDropManager::_inst = nullptr;