Skip to content

Commit 004065a

Browse files
authored
Rename ax::Ref ==> ax::Object (#1877)
* Rename ax::Ref ==> ax::Object * Update Object.h [skip ci]
1 parent b122a1b commit 004065a

File tree

415 files changed

+1491
-1488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

415 files changed

+1491
-1488
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
### Break Changes
2323

24+
- Rename `ax::Ref` ==> `ax::Object`
2425
- Remove `ax::log`, use `AXLOGD` instead
2526
- Remove cmake function: `ax_uwp_set_all_targets_deploy_min_version`
2627
- Remove deprecated pixel formats L8, A8, LA8 in https://github.com/axmolengine/axmol/pull/1839

core/2d/Action.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ THE SOFTWARE.
2929
#ifndef __ACTIONS_CCACTION_H__
3030
#define __ACTIONS_CCACTION_H__
3131

32-
#include "base/Ref.h"
32+
#include "base/Object.h"
3333
#include "math/Math.h"
3434
#include "base/ScriptSupport.h"
3535

@@ -50,7 +50,7 @@ enum
5050
/**
5151
* @brief Base class for Action objects.
5252
*/
53-
class AX_DLL Action : public Ref, public Clonable
53+
class AX_DLL Action : public Object, public Clonable
5454
{
5555
public:
5656
/** Default tag used for all the actions. */

core/2d/ActionCatmullRom.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class Node;
5555
* @ingroup Actions
5656
* @js NA
5757
*/
58-
class AX_DLL PointArray : public Ref, public Clonable
58+
class AX_DLL PointArray : public Object, public Clonable
5959
{
6060
public:
6161
/** Creates and initializes a Points array with capacity.

core/2d/ActionManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ void ActionManager::removeAction(Action* action)
215215
return;
216216
}
217217

218-
Ref* target = action->getOriginalTarget();
218+
Object* target = action->getOriginalTarget();
219219
auto actionIt = _targets.find(static_cast<Node*>(target));
220220
if (actionIt != _targets.end())
221221
{

core/2d/ActionManager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ THE SOFTWARE.
3232

3333
#include "2d/Action.h"
3434
#include "base/Vector.h"
35-
#include "base/Ref.h"
35+
#include "base/Object.h"
3636

3737
NS_AX_BEGIN
3838

@@ -61,7 +61,7 @@ struct ActionHandle
6161
6262
@since v0.8
6363
*/
64-
class AX_DLL ActionManager : public Ref
64+
class AX_DLL ActionManager : public Object
6565
{
6666
public:
6767
/**

core/2d/Animation.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ THE SOFTWARE.
2929
#define __AX_ANIMATION_H__
3030

3131
#include "platform/PlatformConfig.h"
32-
#include "base/Ref.h"
32+
#include "base/Object.h"
3333
#include "base/Value.h"
3434
#include "base/Vector.h"
3535
#include "2d/SpriteFrame.h"
@@ -55,7 +55,7 @@ class SpriteFrame;
5555
5656
@since v2.0
5757
*/
58-
class AX_DLL AnimationFrame : public Ref, public Clonable
58+
class AX_DLL AnimationFrame : public Object, public Clonable
5959
{
6060
public:
6161
/** @struct DisplayedEventInfo
@@ -157,7 +157,7 @@ class AX_DLL AnimationFrame : public Ref, public Clonable
157157
* sprite->runAction(Animate::create(animation));
158158
* @endcode
159159
*/
160-
class AX_DLL Animation : public Ref, public Clonable
160+
class AX_DLL Animation : public Object, public Clonable
161161
{
162162
public:
163163
/** Creates an animation.

core/2d/AnimationCache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ THE SOFTWARE.
2929
#ifndef __AX_ANIMATION_CACHE_H__
3030
#define __AX_ANIMATION_CACHE_H__
3131

32-
#include "base/Ref.h"
32+
#include "base/Object.h"
3333
#include "base/Map.h"
3434
#include "base/Value.h"
3535
#include "2d/Animation.h"

core/2d/CameraBackgroundBrush.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#pragma once
2727

2828
#include "base/Types.h"
29-
#include "base/Ref.h"
29+
#include "base/Object.h"
3030
#include "base/EventListenerCustom.h"
3131
#include "3d/Frustum.h"
3232
#include "renderer/QuadCommand.h"
@@ -54,7 +54,7 @@ class Buffer;
5454
* background with given color and depth, Skybox brush clear the background with a skybox. Camera uses depth brush by
5555
* default.
5656
*/
57-
class AX_DLL CameraBackgroundBrush : public Ref
57+
class AX_DLL CameraBackgroundBrush : public Object
5858
{
5959
public:
6060
/**

core/2d/Component.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ THE SOFTWARE.
2828

2929
/// @cond DO_NOT_SHOW
3030
#include <string>
31-
#include "base/Ref.h"
31+
#include "base/Object.h"
3232
#include "base/ScriptSupport.h"
3333

3434
NS_AX_BEGIN
@@ -44,7 +44,7 @@ enum
4444
kComponentOnUpdate
4545
};
4646

47-
class AX_DLL Component : public Ref
47+
class AX_DLL Component : public Object
4848
{
4949
public:
5050
static Component* create();

core/2d/FastTMXLayer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ class AX_DLL FastTMXLayer : public Node
394394
/** @brief TMXTileAnimTask represents the frame-tick task of an animated tile.
395395
* It is a assistant class for TMXTileAnimTicker.
396396
*/
397-
class AX_DLL TMXTileAnimTask : public Ref
397+
class AX_DLL TMXTileAnimTask : public Object
398398
{
399399
public:
400400
TMXTileAnimTask(FastTMXLayer* layer, TMXTileAnimInfo* animation, const Vec2& tilePos, uint32_t flag = 0);
@@ -429,7 +429,7 @@ class AX_DLL TMXTileAnimTask : public Ref
429429

430430
/** @brief TMXTileAnimManager controls all tile animation of a layer.
431431
*/
432-
class AX_DLL TMXTileAnimManager : public Ref
432+
class AX_DLL TMXTileAnimManager : public Object
433433
{
434434
public:
435435
static TMXTileAnimManager* create(FastTMXLayer* layer);

0 commit comments

Comments
 (0)