From fd238cab362b325e42a847c8214d3569ea328503 Mon Sep 17 00:00:00 2001 From: Jialong Zhai Date: Thu, 30 Oct 2014 14:24:37 +0800 Subject: [PATCH 1/3] modify protected -> CC_CONSTRUCTOR_ACCESS --- cocos/ui/UIVideoPlayer.h | 1 + 1 file changed, 1 insertion(+) diff --git a/cocos/ui/UIVideoPlayer.h b/cocos/ui/UIVideoPlayer.h index 81d0787236..be7d9b985f 100644 --- a/cocos/ui/UIVideoPlayer.h +++ b/cocos/ui/UIVideoPlayer.h @@ -80,6 +80,7 @@ namespace experimental{ virtual cocos2d::ui::Widget* createCloneInstance() override; virtual void copySpecialProperties(Widget* model) override; + CC_CONSTRUCTOR_ACCESS: VideoPlayer(); virtual ~VideoPlayer(); From 4113929fc0e5ac08d3bad3371b272be400435d53 Mon Sep 17 00:00:00 2001 From: Jialong Zhai Date: Thu, 30 Oct 2014 14:36:15 +0800 Subject: [PATCH 2/3] Update UIVideoPlayer.h --- cocos/ui/UIVideoPlayer.h | 1 + 1 file changed, 1 insertion(+) diff --git a/cocos/ui/UIVideoPlayer.h b/cocos/ui/UIVideoPlayer.h index be7d9b985f..5a419a940e 100644 --- a/cocos/ui/UIVideoPlayer.h +++ b/cocos/ui/UIVideoPlayer.h @@ -84,6 +84,7 @@ namespace experimental{ VideoPlayer(); virtual ~VideoPlayer(); + protected: #if CC_VIDEOPLAYER_DEBUG_DRAW CustomCommand _customDebugDrawCommand; void VideoPlayer::drawDebugData(); From ce85ea394603d364403c6fcacfc095f18c177949 Mon Sep 17 00:00:00 2001 From: Jialong Zhai Date: Thu, 30 Oct 2014 14:38:55 +0800 Subject: [PATCH 3/3] fix indentation --- cocos/ui/UIVideoPlayer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/ui/UIVideoPlayer.h b/cocos/ui/UIVideoPlayer.h index 5a419a940e..6dc6ae05c7 100644 --- a/cocos/ui/UIVideoPlayer.h +++ b/cocos/ui/UIVideoPlayer.h @@ -84,7 +84,7 @@ namespace experimental{ VideoPlayer(); virtual ~VideoPlayer(); - protected: + protected: #if CC_VIDEOPLAYER_DEBUG_DRAW CustomCommand _customDebugDrawCommand; void VideoPlayer::drawDebugData();