diff --git a/cocos/2d/CCTransition.cpp b/cocos/2d/CCTransition.cpp index 5e84832ed2..998650f15a 100644 --- a/cocos/2d/CCTransition.cpp +++ b/cocos/2d/CCTransition.cpp @@ -91,7 +91,7 @@ bool TransitionScene::initWithDuration(float t, Scene *scene) if (_outScene == nullptr) { _outScene = Scene::create(); - // just change its state is running that can run actoins later + // just change its state is running that can run actions later // issue: https://github.com/cocos2d/cocos2d-x/issues/17442 _outScene->onEnter(); } diff --git a/cocos/audio/android/jni/cddandroidAndroidJavaEngine.h b/cocos/audio/android/jni/cddandroidAndroidJavaEngine.h index 76869d6edc..51da736618 100644 --- a/cocos/audio/android/jni/cddandroidAndroidJavaEngine.h +++ b/cocos/audio/android/jni/cddandroidAndroidJavaEngine.h @@ -22,8 +22,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CDDANDRIODANDROIDJAVAENGINE_H__ -#define __CDDANDRIODANDROIDJAVAENGINE_H__ +#ifndef __CDDANDROIDANDROIDJAVAENGINE_H__ +#define __CDDANDROIDANDROIDJAVAENGINE_H__ #include "audio/include/SimpleAudioEngine.h" #include "platform/android/jni/JniHelper.h" @@ -67,4 +67,4 @@ namespace CocosDenshion { } } -#endif //__CDDANDRIODANDROIDJAVAENGINE_H__ +#endif //__CDDANDROIDANDROIDJAVAENGINE_H__ diff --git a/cocos/base/CCNS.h b/cocos/base/CCNS.h index 7b8315d709..6fde7fe7e2 100644 --- a/cocos/base/CCNS.h +++ b/cocos/base/CCNS.h @@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __PLATFOMR_CCNS_H__ -#define __PLATFOMR_CCNS_H__ +#ifndef __PLATFORM_CCNS_H__ +#define __PLATFORM_CCNS_H__ #include "math/CCGeometry.h" @@ -76,6 +76,6 @@ Size CC_DLL SizeFromString(const std::string& str); NS_CC_END -#endif // __PLATFOMR_CCNS_H__ +#endif // __PLATFORM_CCNS_H__ diff --git a/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp index 273c3c2f4c..7c730ee3ed 100644 --- a/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp +++ b/cocos/ui/UIEditBox/UIEditBoxImpl-win32.cpp @@ -372,7 +372,7 @@ namespace ui { bool conversionResult = cocos2d::StringUtils::UTF16ToUTF8(wstrResult, utf8Result); if (!conversionResult) { - CCLOG("warning, editbox input text convertion error."); + CCLOG("warning, editbox input text conversion error."); } return std::move(utf8Result); }