Fixes includes in .m and .mm files.

2016-03-21 11:02:00 +08:00 · 2016-03-21 11:02:00 +08:00 · 931d56bc10
parent 6dcd7d51c3
commit 931d56bc10
21 changed files with 39 additions and 39 deletions
--- 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 <Foundation/Foundation.h>
 #import <OpenAL/alc.h>
--- 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 <OpenAL/alc.h>
 #import <AVFoundation/AVFoundation.h>
--- a/cocos/audio/apple/AudioPlayer.mm
+++ b/cocos/audio/apple/AudioPlayer.mm
@ -27,8 +27,8 @@

 #import <Foundation/Foundation.h>

-#include "AudioPlayer.h"
-#include "AudioCache.h"
+#include "audio/apple/AudioPlayer.h"
+#include "audio/apple/AudioCache.h"
 #include "platform/CCFileUtils.h"
 #import <AudioToolbox/ExtendedAudioFile.h>

--- 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;

--- 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 <string>

 #include "platform/CCFileUtils.h"
--- 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 <GameController/GameController.h>

--- 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 <queue>

 ////////////////////////////////////////////////////////////////////////////////
--- 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 <queue>
 #include <errno.h>
--- a/cocos/platform/apple/CCFileUtils-apple.mm
+++ b/cocos/platform/apple/CCFileUtils-apple.mm
@ -25,7 +25,7 @@ THE SOFTWARE.
 ****************************************************************************/
 #import <Foundation/Foundation.h>

-#include "CCFileUtils-apple.h"
+#include "platform/apple/CCFileUtils-apple.h"

 #include <ftw.h>

--- 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"
--- a/cocos/platform/ios/CCGLViewImpl-ios.mm
+++ b/cocos/platform/ios/CCGLViewImpl-ios.mm
@ -28,10 +28,10 @@

 #import <UIKit/UIKit.h>

-#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
--- 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 <Foundation/Foundation.h>

 #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)
 {
--- 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 <Foundation/Foundation.h>

 NS_CC_BEGIN
--- 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)

--- 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;
--- 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;
--- 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"
--- 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

--- 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)
--- 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
--- 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"