Skip to content

Commit d8659d7

Browse files
committed
Merge pull request #3 from pipu/deprecated_reader_purge
Set macro CC_DEPRECATED_ATTRIBUTE for method purge() for all Reader.
2 parents 71fd476 + bb11044 commit d8659d7

File tree

40 files changed

+117
-1
lines changed

40 files changed

+117
-1
lines changed

cocos/editor-support/cocostudio/ActionTimeline/CSLoader.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ class CC_STUDIO_DLL CSLoader
7272
static void destroyInstance();
7373

7474
CSLoader();
75-
void purge();
75+
/** @deprecated Use method destroyInstance() instead */
76+
CC_DEPRECATED_ATTRIBUTE void purge();
7677

7778
static void destroyCocosStudio();
7879

cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,12 @@ FlatBuffersSerialize* FlatBuffersSerialize::getInstance()
123123

124124
return _instanceFlatBuffersSerialize;
125125
}
126+
127+
void FlatBuffersSerialize::purge()
128+
{
129+
CC_SAFE_DELETE(_instanceFlatBuffersSerialize);
130+
131+
}
126132

127133
void FlatBuffersSerialize::destroyInstance()
128134
{

cocos/editor-support/cocostudio/FlatBuffersSerialize.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ class CC_STUDIO_DLL FlatBuffersSerialize
9191

9292
public:
9393
static FlatBuffersSerialize* getInstance();
94+
/** @deprecated Use method destroyInstance() instead */
95+
CC_DEPRECATED_ATTRIBUTE static void purge();
9496
static void destroyInstance();
9597

9698
FlatBuffersSerialize();

cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ class ArmatureNodeReader : public cocos2d::Ref, public cocostudio::NodeReaderPro
5050
~ArmatureNodeReader();
5151

5252
static ArmatureNodeReader* getInstance();
53+
/** @deprecated Use method destroyInstance() instead */
54+
CC_DEPRECATED_ATTRIBUTE static void purge();
5355
static void destroyInstance();
5456

5557
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,

cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ namespace cocostudio
5959
return instanceButtonReader;
6060
}
6161

62+
void ButtonReader::purge()
63+
{
64+
CC_SAFE_DELETE(instanceButtonReader);
65+
}
66+
6267
void ButtonReader::destroyInstance()
6368
{
6469
CC_SAFE_DELETE(instanceButtonReader);

cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ namespace cocostudio
3939
virtual ~ButtonReader();
4040

4141
static ButtonReader* getInstance();
42+
/** @deprecated Use method destroyInstance() instead */
43+
CC_DEPRECATED_ATTRIBUTE static void purge();
4244
static void destroyInstance();
4345

4446
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget,

cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ namespace cocostudio
3939
virtual ~CheckBoxReader();
4040

4141
static CheckBoxReader* getInstance();
42+
/** @deprecated Use method destroyInstance() instead */
43+
CC_DEPRECATED_ATTRIBUTE static void purge();
4244
static void destroyInstance();
4345

4446
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options);

cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ namespace cocostudio
5858
return _instanceComAudioReader;
5959
}
6060

61+
void ComAudioReader::purge()
62+
{
63+
CC_SAFE_DELETE(_instanceComAudioReader);
64+
}
65+
6166
void ComAudioReader::destroyInstance()
6267
{
6368
CC_SAFE_DELETE(_instanceComAudioReader);

cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ namespace cocostudio
4040
~ComAudioReader();
4141

4242
static ComAudioReader* getInstance();
43+
/** @deprecated Use method destroyInstance() instead */
44+
CC_DEPRECATED_ATTRIBUTE static void purge();
4345
static void destroyInstance();
4446

4547
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,

cocos/editor-support/cocostudio/WidgetReader/GameMapReader/GameMapReader.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ namespace cocostudio
4242
~GameMapReader();
4343

4444
static GameMapReader* getInstance();
45+
/** @deprecated Use method destroyInstance() instead */
46+
CC_DEPRECATED_ATTRIBUTE static void purge();
4547
static void destroyInstance();
4648

4749
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,

0 commit comments

Comments
 (0)