From 931d56bc10bb53dce782ea03130ecc1f286f61d7 Mon Sep 17 00:00:00 2001 From: Xpol Wan Date: Mon, 21 Mar 2016 11:02:00 +0800 Subject: [PATCH] Fixes includes in .m and .mm files. --- cocos/audio/apple/AudioCache.mm | 2 +- cocos/audio/apple/AudioEngine-inl.mm | 2 +- cocos/audio/apple/AudioPlayer.mm | 4 ++-- cocos/audio/ios/SimpleAudioEngine.mm | 2 +- cocos/audio/mac/SimpleAudioEngine.mm | 2 +- cocos/base/CCController-iOS.mm | 14 +++++++------- cocos/network/CCDownloader-apple.mm | 2 +- cocos/network/HttpClient-apple.mm | 2 +- cocos/platform/apple/CCFileUtils-apple.mm | 2 +- cocos/platform/ios/CCDevice-ios.mm | 2 +- cocos/platform/ios/CCGLViewImpl-ios.mm | 8 ++++---- .../manual/platform/ios/JavaScriptObjCBridge.mm | 6 +++--- .../manual/platform/ios/CCLuaObjcBridge.mm | 2 +- cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm | 6 +++--- cocos/ui/UIEditBox/Mac/CCUIPasswordTextField.m | 2 +- cocos/ui/UIEditBox/Mac/CCUISingleLineTextField.m | 2 +- cocos/ui/UIEditBox/UIEditBoxImpl-ios.mm | 4 ++-- cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm | 6 +++--- cocos/ui/UIVideoPlayer-ios.mm | 2 +- cocos/ui/UIWebView.mm | 4 ++-- cocos/ui/UIWebViewImpl-ios.mm | 2 +- 21 files changed, 39 insertions(+), 39 deletions(-) diff --git a/cocos/audio/apple/AudioCache.mm b/cocos/audio/apple/AudioCache.mm index 10c30799a1..944b2de016 100644 --- a/cocos/audio/apple/AudioCache.mm +++ b/cocos/audio/apple/AudioCache.mm @@ -25,7 +25,7 @@ #include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC -#include "AudioCache.h" +#include "audio/apple/AudioCache.h" #import #import diff --git a/cocos/audio/apple/AudioEngine-inl.mm b/cocos/audio/apple/AudioEngine-inl.mm index 7edd10a423..fc3ef94b2c 100644 --- a/cocos/audio/apple/AudioEngine-inl.mm +++ b/cocos/audio/apple/AudioEngine-inl.mm @@ -25,7 +25,7 @@ #include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC -#include "AudioEngine-inl.h" +#include "audio/apple/AudioEngine-inl.h" #import #import diff --git a/cocos/audio/apple/AudioPlayer.mm b/cocos/audio/apple/AudioPlayer.mm index 88061b0a99..d6266fc13c 100644 --- a/cocos/audio/apple/AudioPlayer.mm +++ b/cocos/audio/apple/AudioPlayer.mm @@ -27,8 +27,8 @@ #import -#include "AudioPlayer.h" -#include "AudioCache.h" +#include "audio/apple/AudioPlayer.h" +#include "audio/apple/AudioCache.h" #include "platform/CCFileUtils.h" #import diff --git a/cocos/audio/ios/SimpleAudioEngine.mm b/cocos/audio/ios/SimpleAudioEngine.mm index 9b9ebfa399..6a82adaba5 100644 --- a/cocos/audio/ios/SimpleAudioEngine.mm +++ b/cocos/audio/ios/SimpleAudioEngine.mm @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "audio/include/SimpleAudioEngine.h" -#include "SimpleAudioEngine_objc.h" +#include "audio/ios/SimpleAudioEngine_objc.h" #include "cocos2d.h" USING_NS_CC; diff --git a/cocos/audio/mac/SimpleAudioEngine.mm b/cocos/audio/mac/SimpleAudioEngine.mm index c6eeb1cd72..b6b4033e43 100644 --- a/cocos/audio/mac/SimpleAudioEngine.mm +++ b/cocos/audio/mac/SimpleAudioEngine.mm @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "audio/include/SimpleAudioEngine.h" -#include "SimpleAudioEngine_objc.h" +#include "audio/mac/SimpleAudioEngine_objc.h" #include #include "platform/CCFileUtils.h" diff --git a/cocos/base/CCController-iOS.mm b/cocos/base/CCController-iOS.mm index 971a93d477..0eba2ebf3d 100644 --- a/cocos/base/CCController-iOS.mm +++ b/cocos/base/CCController-iOS.mm @@ -23,16 +23,16 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCController.h" +#include "base/CCController.h" #include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "ccMacros.h" -#include "CCEventDispatcher.h" -#include "CCEventController.h" -#include "CCEventListenerController.h" -#include "CCDirector.h" -#include "CCLabel.h" +#include "base/ccMacros.h" +#include "base/CCEventDispatcher.h" +#include "base/CCEventController.h" +#include "base/CCEventListenerController.h" +#include "base/CCDirector.h" +#include "2d/CCLabel.h" #import diff --git a/cocos/network/CCDownloader-apple.mm b/cocos/network/CCDownloader-apple.mm index e1eeea6eed..8ec7fec248 100644 --- a/cocos/network/CCDownloader-apple.mm +++ b/cocos/network/CCDownloader-apple.mm @@ -25,7 +25,7 @@ #include "network/CCDownloader-apple.h" #include "network/CCDownloader.h" -#include "CCString.h" +#include "deprecated/CCString.h" #include //////////////////////////////////////////////////////////////////////////////// diff --git a/cocos/network/HttpClient-apple.mm b/cocos/network/HttpClient-apple.mm index c62df737bc..7124735896 100644 --- a/cocos/network/HttpClient-apple.mm +++ b/cocos/network/HttpClient-apple.mm @@ -27,7 +27,7 @@ #include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) -#include "HttpClient.h" +#include "network/HttpClient.h" #include #include diff --git a/cocos/platform/apple/CCFileUtils-apple.mm b/cocos/platform/apple/CCFileUtils-apple.mm index 789fc39a60..645ac653a4 100644 --- a/cocos/platform/apple/CCFileUtils-apple.mm +++ b/cocos/platform/apple/CCFileUtils-apple.mm @@ -25,7 +25,7 @@ THE SOFTWARE. ****************************************************************************/ #import -#include "CCFileUtils-apple.h" +#include "platform/apple/CCFileUtils-apple.h" #include diff --git a/cocos/platform/ios/CCDevice-ios.mm b/cocos/platform/ios/CCDevice-ios.mm index 98b6e2ce05..5131292dca 100644 --- a/cocos/platform/ios/CCDevice-ios.mm +++ b/cocos/platform/ios/CCDevice-ios.mm @@ -27,7 +27,7 @@ #include "platform/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#include "CCDevice.h" +#include "platform/CCDevice.h" #include "base/ccTypes.h" #include "base/CCEventDispatcher.h" #include "base/CCEventAcceleration.h" diff --git a/cocos/platform/ios/CCGLViewImpl-ios.mm b/cocos/platform/ios/CCGLViewImpl-ios.mm index a7979f48d8..65a37a00aa 100644 --- a/cocos/platform/ios/CCGLViewImpl-ios.mm +++ b/cocos/platform/ios/CCGLViewImpl-ios.mm @@ -28,10 +28,10 @@ #import -#include "CCEAGLView-ios.h" -#include "CCDirectorCaller-ios.h" -#include "CCGLViewImpl-ios.h" -#include "CCSet.h" +#include "platform/ios/CCEAGLView-ios.h" +#include "platform/ios/CCDirectorCaller-ios.h" +#include "platform/ios/CCGLViewImpl-ios.h" +#include "deprecated/CCSet.h" #include "base/CCTouch.h" NS_CC_BEGIN diff --git a/cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm b/cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm index f3e0536cea..55171c1af6 100644 --- a/cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm +++ b/cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm @@ -23,9 +23,9 @@ #import #import "JavaScriptObjCBridge.h" -#include "spidermonkey_specifics.h" -#include "ScriptingCore.h" -#include "js_manual_conversions.h" +#include "scripting/js-bindings/manual/spidermonkey_specifics.h" +#include "scripting/js-bindings/manual/ScriptingCore.h" +#include "scripting/js-bindings/manual/js_manual_conversions.h" #include "cocos2d.h" JavaScriptObjCBridge::CallInfo::~CallInfo(void) { diff --git a/cocos/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.mm b/cocos/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.mm index e011d2ec91..c88599e5e0 100644 --- a/cocos/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.mm +++ b/cocos/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.mm @@ -1,5 +1,5 @@ -#include "CCLuaObjcBridge.h" +#include "scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.h" #include NS_CC_BEGIN diff --git a/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm b/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm index 6c6191e65c..f36e318a9e 100644 --- a/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm +++ b/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm @@ -25,9 +25,9 @@ #import "CCUIEditBoxMac.h" #include "base/CCDirector.h" -#include "CCUISingleLineTextField.h" -#include "CCUIPasswordTextField.h" -#include "CCUIMultilineTextField.h" +#include "ui/UIEditBox/Mac/CCUISingleLineTextField.h" +#include "ui/UIEditBox/Mac/CCUIPasswordTextField.h" +#include "ui/UIEditBox/Mac/CCUIMultilineTextField.h" #define getEditBoxImplMac() ((cocos2d::ui::EditBoxImplMac *)_editBox) diff --git a/cocos/ui/UIEditBox/Mac/CCUIPasswordTextField.m b/cocos/ui/UIEditBox/Mac/CCUIPasswordTextField.m index 19e111deeb..9d64206197 100644 --- a/cocos/ui/UIEditBox/Mac/CCUIPasswordTextField.m +++ b/cocos/ui/UIEditBox/Mac/CCUIPasswordTextField.m @@ -24,7 +24,7 @@ ****************************************************************************/ #import "CCUIPasswordTextField.h" -#include "CCUITextFieldFormatter.h" +#include "ui/UIEditBox/Mac/CCUITextFieldFormatter.h" @interface CCUIPasswordTextField() @property (nonatomic, retain) NSMutableDictionary *placeholderAttributes; diff --git a/cocos/ui/UIEditBox/Mac/CCUISingleLineTextField.m b/cocos/ui/UIEditBox/Mac/CCUISingleLineTextField.m index 46ae2e66d4..78c1bb63b4 100644 --- a/cocos/ui/UIEditBox/Mac/CCUISingleLineTextField.m +++ b/cocos/ui/UIEditBox/Mac/CCUISingleLineTextField.m @@ -24,7 +24,7 @@ ****************************************************************************/ #import "CCUISingleLineTextField.h" -#include "CCUITextFieldFormatter.h" +#include "ui/UIEditBox/Mac/CCUITextFieldFormatter.h" @interface CCUISingleLineTextField() @property (nonatomic, retain) NSMutableDictionary *placeholderAttributes; diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-ios.mm b/cocos/ui/UIEditBox/UIEditBoxImpl-ios.mm index 4ed720f58a..3383bb7f9c 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-ios.mm +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-ios.mm @@ -23,13 +23,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "UIEditBoxImpl-ios.h" +#include "ui/UIEditBox/UIEditBoxImpl-ios.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #define kLabelZOrder 9999 -#include "UIEditBox.h" +#include "ui/UIEditBox/UIEditBox.h" #include "base/CCDirector.h" #include "2d/CCLabel.h" #import "platform/ios/CCEAGLView-ios.h" diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm b/cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm index 5e4c7efb9a..c985a651d5 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm @@ -26,11 +26,11 @@ #include "platform/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) -#include "UIEditBoxImpl-mac.h" +#include "ui/UIEditBox/UIEditBoxImpl-mac.h" #include "base/CCDirector.h" -#include "UIEditBox.h" +#include "ui/UIEditBox/UIEditBox.h" #include "deprecated/CCString.h" -#include "Mac/CCUIEditBoxMac.h" +#include "ui/UIEditBox/Mac/CCUIEditBoxMac.h" NS_CC_BEGIN diff --git a/cocos/ui/UIVideoPlayer-ios.mm b/cocos/ui/UIVideoPlayer-ios.mm index 0afbda35f7..76f1d7dd5f 100644 --- a/cocos/ui/UIVideoPlayer-ios.mm +++ b/cocos/ui/UIVideoPlayer-ios.mm @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "UIVideoPlayer.h" +#include "ui/UIVideoPlayer.h" // No Available on tvOS #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS && !defined(CC_TARGET_OS_TVOS) diff --git a/cocos/ui/UIWebView.mm b/cocos/ui/UIWebView.mm index cd66e7e2d8..573f693e44 100644 --- a/cocos/ui/UIWebView.mm +++ b/cocos/ui/UIWebView.mm @@ -26,7 +26,7 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_PLATFORM_OS_TVOS) -#include "UIWebViewImpl-ios.h" -#include "UIWebView-inl.h" +#include "ui/UIWebViewImpl-ios.h" +#include "ui/UIWebView-inl.h" #endif diff --git a/cocos/ui/UIWebViewImpl-ios.mm b/cocos/ui/UIWebViewImpl-ios.mm index 7abb1a168a..d912919d31 100644 --- a/cocos/ui/UIWebViewImpl-ios.mm +++ b/cocos/ui/UIWebViewImpl-ios.mm @@ -27,7 +27,7 @@ // Webview not available on tvOS #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS) -#include "UIWebViewImpl-ios.h" +#include "ui/UIWebViewImpl-ios.h" #include "renderer/CCRenderer.h" #include "base/CCDirector.h" #include "platform/CCGLView.h"