Merge pull request #14095 from mogemimi/fix-typo

Fix typos

cocos/2d/CCActionInstant.h

@@ -324,7 +324,7 @@ public:
      * In js: var create(var func, var this, var [data]) or var create(var func).
      * In lua:local create(local funcID).
      *
-     * @param func  A callback function need to be excuted.
+     * @param func  A callback function need to be executed.
      * @return  An autoreleased CallFunc object.
      */
     static CallFunc * create(const std::function<void()>& func);
@@ -474,7 +474,7 @@ public:
     /** Creates the action with the callback and the data to pass as an argument.
      *
      * @param target    A certain target.
-     * @param selector  The callback need to be excuted.
+     * @param selector  The callback need to be executed.
      * @param d Data, is void* type.
      * @return An autoreleased __CCCallFuncND object.
      */

cocos/2d/CCRenderTexture.cpp

@@ -281,7 +281,7 @@ bool RenderTexture::initWithWidthAndHeight(int w, int h, Texture2D::PixelFormat
         glBindRenderbuffer(GL_RENDERBUFFER, oldRBO);
         glBindFramebuffer(GL_FRAMEBUFFER, _oldFBO);
         
-        // Diabled by default.
+        // Disabled by default.
         _autoDraw = false;
         
         // add sprite for backward compatibility

cocos/editor-support/cocostudio/CCActionManagerEx.h

@@ -81,7 +81,7 @@ public:
     *
     * @param jsonName  UI file name
     *
-    * @param actionName  action name in teh UIfile.
+    * @param actionName  action name in the UIfile.
     *
     * @return  ActionObject which named as the param name
     */
@@ -92,7 +92,7 @@ public:
     *
     * @param jsonName  UI file name
     *
-    * @param actionName  action name in teh UIfile.
+    * @param actionName  action name in the UIfile.
     *
     * @param func ui action call back
     */
@@ -103,7 +103,7 @@ public:
     *
     * @param jsonName  UI file name
     *
-    * @param actionName  action name in teh UIfile.
+    * @param actionName  action name in the UIfile.
     *
     * @return  ActionObject which named as the param name
     */

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

@@ -22,7 +22,7 @@ namespace cocostudio
     static const char* P_ItemHeight = "itemHeight";
     static const char* P_StartCharMap = "startCharMap";
     
-    static TextAtlasReader* instanceTextAtalsReader = nullptr;
+    static TextAtlasReader* instanceTextAtlasReader = nullptr;
     
     IMPLEMENT_CLASS_NODE_READER_INFO(TextAtlasReader)
     
@@ -38,16 +38,16 @@ namespace cocostudio
     
     TextAtlasReader* TextAtlasReader::getInstance()
     {
-        if (!instanceTextAtalsReader)
+        if (!instanceTextAtlasReader)
         {
-            instanceTextAtalsReader = new (std::nothrow) TextAtlasReader();
+            instanceTextAtlasReader = new (std::nothrow) TextAtlasReader();
         }
-        return instanceTextAtalsReader;
+        return instanceTextAtlasReader;
     }
     
     void TextAtlasReader::destroyInstance()
     {
-        CC_SAFE_DELETE(instanceTextAtalsReader);
+        CC_SAFE_DELETE(instanceTextAtlasReader);
     }
     
     void TextAtlasReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode)

cocos/network/HttpRequest.h

@@ -274,9 +274,9 @@ public:
     }
     
     /** 
-     * Get the target of callback selector funtion, mainly used by HttpClient.
+     * Get the target of callback selector function, mainly used by HttpClient.
      *
-     * @return Ref* the target of callback selector funtion
+     * @return Ref* the target of callback selector function
      */
     inline Ref* getTarget()
     {

cocos/network/HttpResponse.h

@@ -104,7 +104,7 @@ public:
      * To see if the http reqeust is returned successfully.
      * Althrough users can judge if (http response code = 200), we want an easier way.
      * If this getter returns false, you can call getResponseCode and getErrorBuffer to find more details.
-     * @return bool the flag that represent whether the http request return sucesssfully or not.
+     * @return bool the flag that represent whether the http request return successfully or not.
      */
     inline bool isSucceed()
     {
@@ -130,7 +130,7 @@ public:
     }
 
     /** 
-     * Get the http response code to judge whether response is sucessful or not.
+     * Get the http response code to judge whether response is successful or not.
      * I know that you want to see the _responseCode is 200.
      * If _responseCode is not 200, you should check the meaning for _responseCode by the net.
      * @return long the value of _responseCode

cocos/network/SocketIO.h

@@ -105,7 +105,7 @@ public:
         /**
          * This is kept for backwards compatibility, connect is now fired as a socket.io event "connect"
          * 
-         * This function would be called when the related SIOClient object recevie messages that mean it have connected to endpoint sucessfully.
+         * This function would be called when the related SIOClient object recevie messages that mean it have connected to endpoint successfully.
          *
          * @param client the connected SIOClient object.
          */

cocos/platform/apple/CCFileUtils-apple.h

@@ -45,7 +45,7 @@ class CC_DLL FileUtilsApple : public FileUtils
 {
 public:
     FileUtilsApple();
-    /* override funtions */
+    /* override functions */
     virtual std::string getWritablePath() const override;
     virtual std::string getFullPathForDirectoryAndFilename(const std::string& directory, const std::string& filename) const override;
 

cocos/platform/desktop/CCGLViewImpl-desktop.cpp

@@ -446,7 +446,7 @@ bool GLViewImpl::initWithFullscreen(const std::string &viewname, const GLFWvidmo
     if (nullptr == _monitor)
         return false;
     
-    //These are soft contraints. If the video mode is retrieved at runtime, the resulting window and context should match these exactly. If invalid attribs are passed (eg. from an outdated cache), window creation will NOT fail but the actual window/context may differ.
+    //These are soft constraints. If the video mode is retrieved at runtime, the resulting window and context should match these exactly. If invalid attribs are passed (eg. from an outdated cache), window creation will NOT fail but the actual window/context may differ.
     glfwWindowHint(GLFW_REFRESH_RATE, videoMode.refreshRate);
     glfwWindowHint(GLFW_RED_BITS, videoMode.redBits);
     glfwWindowHint(GLFW_BLUE_BITS, videoMode.blueBits);

cocos/platform/linux/CCFileUtils-linux.h

@@ -48,7 +48,7 @@ class CC_DLL FileUtilsLinux : public FileUtils
     FileUtilsLinux();
     std::string _writablePath;
 public:
-    /* override funtions */
+    /* override functions */
     bool init();
     virtual std::string getWritablePath() const;
 private:

cocos/platform/mac/CCDevice-mac.mm

@@ -202,7 +202,7 @@ static bool _initWithString(const char * text, Device::TextAlign align, const ch
         
         [image lockFocus];
         
-        // patch for mac retina display and lableTTF
+        // patch for mac retina display and labelTTF
         [[NSAffineTransform transform] set];
         
         //[stringWithAttributes drawAtPoint:NSMakePoint(xPadding, offsetY)]; // draw at offset position

cocos/platform/winrt/CCFileUtilsWinRT.h

@@ -45,7 +45,7 @@ class CC_DLL CCFileUtilsWinRT : public FileUtils
     friend class FileUtils;
     CCFileUtilsWinRT();
 public:
-    /* override funtions */
+    /* override functions */
     bool init();
     virtual std::string getWritablePath() const;
     virtual bool isAbsolutePath(const std::string& strPath) const;

cocos/ui/UIEditBox/UIEditBox.h

@@ -455,7 +455,7 @@ namespace ui {
          */
         virtual void keyboardDidHide(IMEKeyboardNotificationInfo& info) override;
             
-        /* callback funtions
+        /* callback functions
          * @js NA
          * @lua NA
          */

cocos/ui/UILayout.cpp

@@ -254,7 +254,7 @@ void Layout::stencilClippingVisit(Renderer *renderer, const Mat4& parentTransfor
     // To ease the migration to v3.0, we still support the Mat4 stack,
     // but it is deprecated and your code should not rely on it
     Director* director = Director::getInstance();
-    CCASSERT(nullptr != director, "Director is null when seting matrix stack");
+    CCASSERT(nullptr != director, "Director is null when setting matrix stack");
     director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
     director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform);
     //Add group command
@@ -376,7 +376,7 @@ void Layout::onBeforeVisitStencil()
 void Layout::drawFullScreenQuadClearStencil()
 {
     Director* director = Director::getInstance();
-    CCASSERT(nullptr != director, "Director is null when seting matrix stack");
+    CCASSERT(nullptr != director, "Director is null when setting matrix stack");
 
     director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
     director->loadIdentityMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);

cocos/ui/UILayout.h

@@ -369,7 +369,7 @@ public:
      *
      * @param child     A child node
      * @param localZOrder    Z order for drawing priority. Please refer to setLocalZOrder(int)
-     * @param tag       A interger to identify the node easily. Please refer to setTag(int)
+     * @param tag       A integer to identify the node easily. Please refer to setTag(int)
      */
     virtual void addChild(Node* child, int localZOrder, int tag) override;
     virtual void addChild(Node* child, int localZOrder, const std::string &name) override;
@@ -387,7 +387,7 @@ public:
     /**
      * Removes all children from the container, and do a cleanup to all running actions depending on the cleanup parameter.
      *
-     * @param cleanup   true if all running actions on all children nodes should be cleanup, false oterwise.
+     * @param cleanup   true if all running actions on all children nodes should be cleanup, false otherwise.
      * @js removeAllChildren
      * @lua removeAllChildren
      */

cocos/ui/UIScale9Sprite.cpp

@@ -1133,10 +1133,10 @@ namespace ui {
         this->_insetBottom = _originalSize.height - _insetTop - capInsets.size.height;
     }
 
-    void Scale9Sprite::setPreferredSize(const Size& preferedSize)
+    void Scale9Sprite::setPreferredSize(const Size& preferredSize)
     {
-        this->setContentSize(preferedSize);
-        this->_preferredSize = preferedSize;
+        this->setContentSize(preferredSize);
+        this->_preferredSize = preferredSize;
     }
 
 
@@ -1196,7 +1196,7 @@ namespace ui {
         // To ease the migration to v3.0, we still support the Mat4 stack,
         // but it is deprecated and your code should not rely on it
         Director* director = Director::getInstance();
-        CCASSERT(nullptr != director, "Director is null when seting matrix stack");
+        CCASSERT(nullptr != director, "Director is null when setting matrix stack");
         director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
         director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform);
 

cocos/ui/UIScale9Sprite.h

@@ -481,16 +481,16 @@ namespace ui {
         Size getOriginalSize() const;
         
         /**
-         * @brief Change the prefered size of Scale9Sprite.
+         * @brief Change the preferred size of Scale9Sprite.
          *
          * @param size A delimitation zone.
          */
         void setPreferredSize(const Size& size);
         
         /**
-         * @brief Query the  Scale9Sprite's prefered size.
+         * @brief Query the Scale9Sprite's preferred size.
          *
-         * @return Scale9Sprite's prefered size.
+         * @return Scale9Sprite's preferred size.
          */
         Size getPreferredSize() const;
         
@@ -502,7 +502,7 @@ namespace ui {
         void setCapInsets(const Rect& rect);
         
         /**
-         * @brief Query the Scale9Sprite's prefered size.
+         * @brief Query the Scale9Sprite's preferred size.
          *
          * @return Scale9Sprite's cap inset.
          */
@@ -664,7 +664,7 @@ namespace ui {
          * If you want to flip the anchorPoint too, and/or to flip the children too use:
          * widget->setScaleY(widget->getScaleY() * -1);
          *
-         * @return true if the widget is flipped vertically, flase otherwise.
+         * @return true if the widget is flipped vertically, false otherwise.
          */
         virtual bool isFlippedY()const;
         

cocos/ui/UIVideoPlayer-android.cpp

@@ -262,7 +262,7 @@ void VideoPlayer::setKeepAspectRatioEnabled(bool enable)
 void VideoPlayer::drawDebugData()
 {
     Director* director = Director::getInstance();
-    CCASSERT(nullptr != director, "Director is null when seting matrix stack");
+    CCASSERT(nullptr != director, "Director is null when setting matrix stack");
 
     director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
     director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform);

cocos/ui/UIWidget.h

@@ -389,7 +389,7 @@ public:
     /**
      * Sets whether the widget should be flipped vertically or not.
      *
-     * @param flippedY true if the widget should be flipped vertically, flase otherwise.
+     * @param flippedY true if the widget should be flipped vertically, false otherwise.
      */
     virtual void setFlippedY(bool flippedY);
 
@@ -400,7 +400,7 @@ public:
      * Also, flipping relies on widget's anchor point.
      * Internally, it just use setScaleY(-1) to flip the widget.
      *
-     * @return true if the widget is flipped vertically, flase otherwise.
+     * @return true if the widget is flipped vertically, false otherwise.
      */
     virtual bool isFlippedY()const{return _flippedY;};
 
@@ -429,7 +429,7 @@ public:
      *
      * @param pt A point in `Vec2`.
      * @deprecated  use `isClippingParentContainsPoint` instead.
-     * @return true if the point is in parent's area, flase otherwise.
+     * @return true if the point is in parent's area, false otherwise.
      */
     CC_DEPRECATED_ATTRIBUTE bool clippingParentAreaContainPoint(const Vec2 &pt){return this->isClippingParentContainsPoint(pt);}
 
@@ -437,7 +437,7 @@ public:
      * Checks a point if in parent's area.
      *
      * @param pt A point in `Vec2`.
-     * @return true if the point is in parent's area, flase otherwise.
+     * @return true if the point is in parent's area, false otherwise.
      */
     bool isClippingParentContainsPoint(const Vec2& pt);
 
@@ -546,7 +546,7 @@ public:
      * @param pt        The point in `Vec2`.
      * @param camera    The camera look at widget, used to convert GL screen point to near/far plane.
      * @param p         Point to a Vec3 for store the intersect point, if don't need them set to nullptr.
-     * @return true if the point is in widget's content space, flase otherwise.
+     * @return true if the point is in widget's content space, false otherwise.
      */
     virtual bool hitTest(const Vec2 &pt, const Camera* camera, Vec3 *p) const;
 

extensions/GUI/CCControlExtension/CCControlButton.h

@@ -172,7 +172,7 @@ public:
     virtual void setMargins(int marginH, int marginV);
 
     /** Adjust the background image. YES by default. If the property is set to NO, the
-     background will use the prefered size of the background image. */
+     background will use the preferred size of the background image. */
     bool doesAdjustBackgroundImage();
     void setAdjustBackgroundImage(bool adjustBackgroundImage);
 
@@ -223,7 +223,7 @@ protected:
     /** The current background sprite. */
     CC_SYNTHESIZE_RETAIN(cocos2d::ui::Scale9Sprite*, _backgroundSprite, BackgroundSprite);
 
-    /** The prefered size of the button, if label is larger it will be expanded. */
+    /** The preferred size of the button, if label is larger it will be expanded. */
     CC_PROPERTY_PASS_BY_REF(Size, _preferredSize, PreferredSize);
 
     /** Adjust the button zooming on touchdown. Default value is YES. */

extensions/GUI/CCControlExtension/CCControlPotentiometer.h

@@ -83,7 +83,7 @@ public:
     virtual void onTouchMoved(Touch *pTouch, Event *pEvent) override;
     virtual void onTouchEnded(Touch *pTouch, Event *pEvent) override;
 
-    /** Factorize the event dispath into these methods. */
+    /** Factorize the event dispatch into these methods. */
     void potentiometerBegan(Vec2 location);
     void potentiometerMoved(Vec2 location);
     void potentiometerEnded(Vec2 location);

extensions/GUI/CCScrollView/CCScrollView.cpp

@@ -621,7 +621,7 @@ void ScrollView::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t
     // To ease the migration to v3.0, we still support the Mat4 stack,
     // but it is deprecated and your code should not rely on it
     Director* director = Director::getInstance();
-    CCASSERT(nullptr != director, "Director is null when seting matrix stack");
+    CCASSERT(nullptr != director, "Director is null when setting matrix stack");
     director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
     director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform);
 

extensions/GUI/CCScrollView/CCTableView.h

@@ -154,11 +154,11 @@ public:
         BOTTOM_UP
     };
     
-    /** Empty contructor of TableView */
+    /** Empty constructor of TableView */
     static TableView* create();
     
     /**
-     * An intialized table view object
+     * An initialized table view object
      *
      * @param dataSource data source
      * @param size view size

extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h

@@ -88,7 +88,7 @@ public:
     @remarks
         If a new force-emitter name has been set, the removeAsListener must be called, to remove the DoPlacementParticleEventHandler
         from the old technique (to which the force-emitter belongs. Only then the new force-emitter is used. 
-        The reason why it is not called automatically in the setForceEmitterName() funtion is to offer some flexibility on 
+        The reason why it is not called automatically in the setForceEmitterName() function is to offer some flexibility on 
         the moment the removeAsListener() is called.
     */
     void removeAsListener(void);