diff --git a/Doxyfile b/Doxyfile index 37a58cf6b..5ff28b401 100644 --- a/Doxyfile +++ b/Doxyfile @@ -559,7 +559,7 @@ INTERNAL_DOCS = NO # names in lower-case letters. If set to YES, upper-case letters are also # allowed. This is useful if you have classes or files whose names only differ # in case and if your file system supports case sensitive file names. Windows -# (including Cygwin) ands Mac users are advised to set this option to NO. +# (including Cygwin) and Mac users are advised to set this option to NO. # The default value is: system dependent. CASE_SENSE_NAMES = NO diff --git a/bin/assets/i18n/de.xml b/bin/assets/i18n/de.xml index 482edba27..7d263e08a 100644 --- a/bin/assets/i18n/de.xml +++ b/bin/assets/i18n/de.xml @@ -71,7 +71,7 @@ Diese Operation kann nicht rückgängig gemacht werden! Betriebssystem von gegenwärtigem Build nicht unterstützt! Build-Output: Build-Probleme zeigen Build-Output: Build-Output zeigen - Build-Einstellungen + Build-Einstellungen Build-Einstellungen * Änderungen werden automatisch gespeichert Schritt %u: %s @@ -111,7 +111,7 @@ Diese Operation kann nicht rückgängig gemacht werden! Bereinigen Verlauf Bereinigen Menü bereinigen - Systemumgebung bereinigen + Systemumgebung bereinigen Aktuelle Unterhaltung duplizieren Duplizieren... Einstellung duplizieren @@ -176,7 +176,7 @@ Alle ungespeicherten Änderungen gehen dann verloren. Fehlermeldung kopieren Dateipfad kopieren Dateipfad und -position kopieren - Datei konnte nicht geschrieben werden. + Datei konnte nicht geschrieben werden. Dateispeicherung auf Datenträger fehlgeschlagen. Bitte prüfen, ob Datei schreibgeschützt ist oder ecode nicht über die Schreibberechtigung verfügt. Dateipfad: @@ -338,7 +338,7 @@ ecode versucht, externes Terminal zu öffnen. Vollbild umschalten Git Zweig hinzufügen - Letzten Commit abändern + Letzten Commit abändern Stash anwenden Stash anwenden Git-Blame diff --git a/bin/assets/i18n/en.xml b/bin/assets/i18n/en.xml index 4edfdbe2e..a01f993f9 100644 --- a/bin/assets/i18n/en.xml +++ b/bin/assets/i18n/en.xml @@ -56,7 +56,7 @@ This operation cannot be reverted! Operating System not supported for this build! Build Output Show Build Issues Build Output Show Build Output - Build Settings + Build Settings Build Settings * All changes are automatically saved Step %u: %s @@ -96,7 +96,7 @@ This operation cannot be reverted! Clear Clear History Clear Menu - Clear System Environment + Clear System Environment Clone Current Conversation Clone... Clone Setting @@ -161,7 +161,7 @@ All changes will be lost. Copy Error Message Copy File Path Copy File Path And Position - Couldn't write the file. + Couldn't write the file. Could not write file to disk. Please check if the file is read-only or if ecode does not have permissions to write to that file. File path is: @@ -323,7 +323,7 @@ ecode will try to open an external terminal. Fullscreen Toggle Git Add Branch - Ammend last commit + Amend last commit Apply Stash Apply Stash Git Blame @@ -449,7 +449,7 @@ Be aware that many of the core keybindings can be found there. Locate Files & Symbols Lock Lock Chat Memory - Lock a chat memory to avoid being deleted during memory clean-ups. Chat memory will only be able to be deleted manually in the chat history. + Lock a chat memory to avoid being deleted during memory clean-ups. Chat memory will only be able to be deleted manually in the chat history. Lock Toggle Code Action Find References to Symbol Under Cursor @@ -784,7 +784,7 @@ Minimum value is 1, and maximum 6. Requires restart. Switch To Previous Split Symlink target Synchronize project tree with editor - Syncronizes the current focused document as the selected + Synchronizes the current focused document as the selected file in the directory tree. Syntax Color Scheme System @@ -906,7 +906,7 @@ Restart ecode to see the changes. Working Directory Working Dir %s - Search Worskspace Symbol... + Search Workspace Symbol... Letter wrap Wrap Mode Wrap Against... diff --git a/bin/assets/i18n/zh_CN.xml b/bin/assets/i18n/zh_CN.xml index 4919a5738..2d8abc963 100644 --- a/bin/assets/i18n/zh_CN.xml +++ b/bin/assets/i18n/zh_CN.xml @@ -50,7 +50,7 @@ 系统不支持此构建！ Build Output Show Build Issues Build Output Show Build Output - Build Settings + Build Settings 构建设置 * 修改已自动保存 Step %u: %s @@ -82,7 +82,7 @@ 清理历史 清空菜单 - Clear System Environment + Clear System Environment Clone Setting Cloned name must be different from any existing build name. 关闭 @@ -130,7 +130,7 @@ 复制错误信息 复制文件路径 复制文件路径 - 无法写入文件。 + 无法写入文件。 无法向磁盘写入文件 请检查文件是否被只读保护或ecode没有足够权限。 文件路径： @@ -244,7 +244,7 @@ 切换全屏 Git 添加分支 - Ammend last commit + Amend last commit Apply Stash Apply Stash Git Blame @@ -587,7 +587,7 @@ Restart ecode to see the changes. Switch To Previous Split 软链接目标 Synchronize project tree with editor - Syncronizes the current focused document as the selected + Synchronizes the current focused document as the selected file in the directory tree. 语法高亮配色 页宽 diff --git a/include/eepp/core/noncopyable.hpp b/include/eepp/core/noncopyable.hpp index 57880ffdd..032aee9b9 100644 --- a/include/eepp/core/noncopyable.hpp +++ b/include/eepp/core/noncopyable.hpp @@ -11,7 +11,7 @@ class EE_API NonCopyable { /** @brief Default constructor ** Because this class has a copy constructor, the compiler ** will not automatically generate the default constructor. - ** That's why we must define it explicitely. */ + ** That's why we must define it explicitly. */ NonCopyable() {} private: @@ -37,7 +37,7 @@ class EE_API NonCopyable { #endif /** @class EE::NonCopyable -** This class makes its instances non-copyable, by explicitely +** This class makes its instances non-copyable, by explicitly ** disabling its copy constructor and its assignment operator. ** To create a non-copyable class, simply inherit from ** EE::NonCopyable. diff --git a/include/eepp/core/string.hpp b/include/eepp/core/string.hpp index 9ab249c4c..3c26b63df 100644 --- a/include/eepp/core/string.hpp +++ b/include/eepp/core/string.hpp @@ -387,10 +387,10 @@ class EE_API String { /** Replace all occurrences of the search string with the replacement string. */ static void replaceAll( String& target, const String& that, const String& with ); - /** Replace the first ocurrence of the search string with the replacement string. */ + /** Replace the first occurrence of the search string with the replacement string. */ static void replace( std::string& target, const std::string& that, const std::string& with ); - /** Replace the first ocurrence of the search string with the replacement string. */ + /** Replace the first occurrence of the search string with the replacement string. */ static void replace( String& target, const String& that, const String& with ); /** Removes the numbers at the end of the string */ @@ -405,7 +405,7 @@ class EE_API String { /** Removes the trailing 0 and . in a string number */ static void numberCleanInPlace( std::string& strNumber ); - /** Searchs the position of the corresponding close bracket in a string. */ + /** Searches the position of the corresponding close bracket in a string. */ static std::size_t findCloseBracket( const std::string& string, std::size_t startOffset, char openBracket, char closeBracket ); @@ -531,7 +531,7 @@ class EE_API String { /** @return The next character in a utf8 null terminated string */ static Uint32 utf8Next( char*& utf8String ); - /** Converts an UTF-8 string view into an UTF-32 by using a currently allocated buffer (usefull + /** Converts an UTF-8 string view into an UTF-32 by using a currently allocated buffer (useful * for stack allocated buffers) * @return The number of elements written into the buffer (the string length) **/ @@ -638,7 +638,7 @@ class EE_API String { /** @brief Implicit cast operator to std::string (ANSI string) ** The current global locale is used for conversion. If you - ** want to explicitely specify a locale, see toAnsiString. + ** want to explicitly specify a locale, see toAnsiString. ** Characters that do not fit in the target encoding are ** discarded from the returned string. ** This operator is defined for convenience, and is equivalent diff --git a/include/eepp/core/utf.hpp b/include/eepp/core/utf.hpp index d665ab812..4eabebcaf 100644 --- a/include/eepp/core/utf.hpp +++ b/include/eepp/core/utf.hpp @@ -728,7 +728,7 @@ typedef Utf<32> Utf32; /// to handle ANSI, wide, UTF-8, UTF-16 and UTF-32 encodings. /// /// EE::Utf functions are all static, these classes are not meant to -/// be instanciated. All the functions are template, so that you +/// be instantiated. All the functions are template, so that you /// can use any character / string type for a given encoding. /// /// It has 3 specializations: diff --git a/include/eepp/graphics/batchrenderer.hpp b/include/eepp/graphics/batchrenderer.hpp index 50c6c1d6d..d14ec3bf1 100644 --- a/include/eepp/graphics/batchrenderer.hpp +++ b/include/eepp/graphics/batchrenderer.hpp @@ -32,11 +32,11 @@ class EE_API BatchRenderer { virtual ~BatchRenderer(); - /** Construct with a defined number of vertexs preallocated */ + /** Construct with a defined number of vertices preallocated */ BatchRenderer( const unsigned int& Prealloc ); - /** Allocate space for vertexs */ - void allocVertexs( const unsigned int& size ); + /** Allocate space for vertices */ + void allocVertices( const unsigned int& size ); /** Set the current texture to render on the batch ( if you change the texture and you have * batched something, this will be renderer immediately ) */ @@ -86,28 +86,28 @@ class EE_API BatchRenderer { Vector2f getBatchCenter() const { return mCenter; } /** Add to the batch a quad ( this will change your batch rendering method to PRIMITIVE_QUADS, - * so if you were using another one will Draw all the batched vertexs first ) */ + * so if you were using another one will Draw all the batched vertices first ) */ void batchQuadEx( Float x, Float y, Float width, Float height, Float angle = 0.0f, Vector2f scale = Vector2f::One, OriginPoint originPoint = OriginPoint( OriginPoint::OriginCenter ) ); /** Add to the batch a quad ( this will change your batch rendering method to PRIMITIVE_QUADS, - * so if you were using another one will Draw all the batched vertexs first ) */ + * so if you were using another one will Draw all the batched vertices first ) */ void batchQuad( const Float& x, const Float& y, const Float& width, const Float& height ); /** Add to the batch a quad ( this will change your batch rendering method to PRIMITIVE_QUADS, - * so if you were using another one will Draw all the batched vertexs first ) */ + * so if you were using another one will Draw all the batched vertices first ) */ void batchQuad( const Rectf& rect ); /** Add to the batch a quad with the vertex freely seted ( this will change your batch rendering - * method to PRIMITIVE_QUADS, so if you were using another one will Draw all the batched vertexs - * first ) */ + * method to PRIMITIVE_QUADS, so if you were using another one will Draw all the batched + * vertices first ) */ void batchQuadFree( const Float& x0, const Float& y0, const Float& x1, const Float& y1, const Float& x2, const Float& y2, const Float& x3, const Float& y3 ); /** Add to the batch a quad with the vertex freely seted ( this will change your batch rendering - * method to PRIMITIVE_QUADS, so if you were using another one will Draw all the batched vertexs - * first ) */ + * method to PRIMITIVE_QUADS, so if you were using another one will Draw all the batched + * vertices first ) */ void batchQuadFreeEx( const Float& x0, const Float& y0, const Float& x1, const Float& y1, const Float& x2, const Float& y2, const Float& x3, const Float& y3, const Float& Angle = 0.0f, const Float& Scale = 1.0f ); @@ -164,7 +164,7 @@ class EE_API BatchRenderer { void linesSetColorFree( const Color& Color0, const Color& Color1 ); /** Add to the batch a line ( this will change your batch rendering method to PRIMITIVE_LINES, - * so if you were using another one will Draw all the batched vertexs first ) */ + * so if you were using another one will Draw all the batched vertices first ) */ void batchLine( const Float& x0, const Float& y0, const Float& x1, const Float& y1 ); /** This will set as the default batch rendering to GL_LINE_LOOP. And will reset the line color @@ -178,23 +178,25 @@ class EE_API BatchRenderer { void lineLoopSetColorFree( const Color& Color0, const Color& Color1 ); /** Add to the batch a line ( this will change your batch rendering method to - * PRIMITIVE_LINE_LOOP, so if you were using another one will Draw all the batched vertexs first + * PRIMITIVE_LINE_LOOP, so if you were using another one will Draw all the batched vertices + * first * ) */ void batchLineLoop( const Float& x0, const Float& y0, const Float& x1, const Float& y1 ); /** Add to the batch a point to the line loop batch ( this will change your batch rendering * method to PRIMITIVE_LINE_LOOP, so if you were using another one will Draw all the batched - * vertexs first ) */ + * vertices first ) */ void batchLineLoop( const Float& x0, const Float& y0 ); /** Add to the batch a line ( this will change your batch rendering method to - * PRIMITIVE_LINE_LOOP, so if you were using another one will Draw all the batched vertexs first + * PRIMITIVE_LINE_LOOP, so if you were using another one will Draw all the batched vertices + * first * ) */ void batchLineLoop( const Vector2f& vector1, const Vector2f& vector2 ); /** Add to the batch a point to the line loop batch ( this will change your batch rendering * method to PRIMITIVE_LINE_LOOP, so if you were using another one will Draw all the batched - * vertexs first ) */ + * vertices first ) */ void batchLineLoop( const Vector2f& vector1 ); /** This will set as the default batch rendering to PRIMITIVE_LINE_STRIP. And will reset the @@ -208,23 +210,23 @@ class EE_API BatchRenderer { void lineStripSetColorFree( const Color& Color0, const Color& Color1 ); /** Add to the batch a line ( this will change your batch rendering method to - * PRIMITIVE_LINE_STRIP, so if you were using another one will Draw all the batched vertexs + * PRIMITIVE_LINE_STRIP, so if you were using another one will Draw all the batched vertices * first ) */ void batchLineStrip( const Float& x0, const Float& y0, const Float& x1, const Float& y1 ); /** Add to the batch a point to the line strip batch ( this will change your batch rendering * method to PRIMITIVE_LINE_STRIP, so if you were using another one will Draw all the batched - * vertexs first ) */ + * vertices first ) */ void batchLineStrip( const Float& x0, const Float& y0 ); /** Add to the batch a line ( this will change your batch rendering method to - * PRIMITIVE_LINE_STRIP, so if you were using another one will Draw all the batched vertexs + * PRIMITIVE_LINE_STRIP, so if you were using another one will Draw all the batched vertices * first ) */ void batchLineStrip( const Vector2f& vector1, const Vector2f& vector2 ); /** Add to the batch a point to the line strip batch ( this will change your batch rendering * method to PRIMITIVE_LINE_STRIP, so if you were using another one will Draw all the batched - * vertexs first ) */ + * vertices first ) */ void batchLineStrip( const Vector2f& vector1 ); /** This will set as the default batch rendering to PRIMITIVE_TRIANGLE_FAN. And will reset the @@ -242,13 +244,13 @@ class EE_API BatchRenderer { const Float& x2, const Float& y2 ); /** Add to the batch a triangle fan ( this will change your batch rendering method to - * PRIMITIVE_TRIANGLE_FAN, so if you were using another one will Draw all the batched vertexs + * PRIMITIVE_TRIANGLE_FAN, so if you were using another one will Draw all the batched vertices * first ) */ void batchTriangleFan( const Float& x0, const Float& y0, const Float& x1, const Float& y1, const Float& x2, const Float& y2 ); /** Add to the batch a triangle fan ( this will change your batch rendering method to - * PRIMITIVE_TRIANGLE_FAN, so if you were using another one will Draw all the batched vertexs + * PRIMITIVE_TRIANGLE_FAN, so if you were using another one will Draw all the batched vertices * first ) */ void batchTriangleFan( const Float& x0, const Float& y0 ); @@ -267,7 +269,8 @@ class EE_API BatchRenderer { const Float& x2, const Float& y2 ); /** Add to the batch a triangle ( this will change your batch rendering method to - * PRIMITIVE_TRIANGLES, so if you were using another one will Draw all the batched vertexs first + * PRIMITIVE_TRIANGLES, so if you were using another one will Draw all the batched vertices + * first * ) */ void batchTriangle( const Float& x0, const Float& y0, const Float& x1, const Float& y1, const Float& x2, const Float& y2 ); @@ -276,7 +279,8 @@ class EE_API BatchRenderer { void polygonSetColor( const Color& Color ); /** Add to the batch a polygon ( this will change your batch rendering method to - * PRIMITIVE_POLYGON, so if you were using another one will Draw all the batched vertexs first ) + * PRIMITIVE_POLYGON, so if you were using another one will Draw all the batched vertices first + * ) */ void batchPolygon( const Polygon2f& Polygon ); @@ -292,10 +296,10 @@ class EE_API BatchRenderer { /** @return The current point size */ Float getPointSize(); - /** Batch a poligon adding one by one vector */ + /** Batch a polygon adding one by one vector */ void batchPolygonByPoint( const Float& x, const Float& y ); - /** Batch a poligon adding one by one vector */ + /** Batch a polygon adding one by one vector */ void batchPolygonByPoint( const Vector2f& Vector ); /** Foce the blending mode change, ignoring if it's the same that before ( so you can change the @@ -333,7 +337,7 @@ class EE_API BatchRenderer { void init(); - void addVertexs( const unsigned int& num ); + void addVertices( const unsigned int& num ); void rotate( const Vector2f& center, Vector2f* point, const Float& angle ); diff --git a/include/eepp/graphics/fontmanager.hpp b/include/eepp/graphics/fontmanager.hpp index 86f6f6722..74d7a455b 100644 --- a/include/eepp/graphics/fontmanager.hpp +++ b/include/eepp/graphics/fontmanager.hpp @@ -11,7 +11,7 @@ using namespace EE::System; namespace EE { namespace Graphics { /** @brief The Font Manager is a singleton class that manages all the instance of fonts - instanciated. And releases the font instances automatically. So the user doesn't need to release + instantiated. And releases the font instances automatically. So the user doesn't need to release any font instance. */ class EE_API FontManager : public ResourceManager { diff --git a/include/eepp/graphics/framebuffer.hpp b/include/eepp/graphics/framebuffer.hpp index d88cdf482..d6c83fac8 100644 --- a/include/eepp/graphics/framebuffer.hpp +++ b/include/eepp/graphics/framebuffer.hpp @@ -13,7 +13,7 @@ using namespace EE::Window; namespace EE { namespace Graphics { -/** @brief A frame buffer allows rendering to a off-sreen 2D texture */ +/** @brief A frame buffer allows rendering to a off-screen 2D texture */ class EE_API FrameBuffer { public: /** @brief Creates a new instance of a frame buffer @@ -34,7 +34,7 @@ class EE_API FrameBuffer { /** @brief Enables the off-screen rendering. ** From this moment any rendered primitive will be rendered to the frame buffer. - ** Anything rendered since the frame buffer is binded will use the fram buffer coordinates, so + ** Anything rendered since the frame buffer is binded will use the frame buffer coordinates, so *position 0,0 means 0,0 point in the frame buffer, not the screen. */ virtual void bind() = 0; diff --git a/include/eepp/graphics/image.hpp b/include/eepp/graphics/image.hpp index e9d64f8f6..f32ed63ac 100644 --- a/include/eepp/graphics/image.hpp +++ b/include/eepp/graphics/image.hpp @@ -391,7 +391,7 @@ class EE_API Image { /** Flip the image ( rotate the image 90º ) */ virtual void flip(); - /** Create a thumnail of the image */ + /** Create a thumbnail of the image */ Graphics::Image* thumbnail( const Uint32& maxWidth, const Uint32& maxHeight, ResamplerFilter filter = ResamplerFilter::RESAMPLER_LANCZOS4 ); @@ -411,7 +411,7 @@ class EE_API Image { /** @return A copy of the original image */ Graphics::Image* copy(); - /** Overload the assigment operator to ensure the image copy */ + /** Overload the assignment operator to ensure the image copy */ Graphics::Image& operator=( const Image& right ); /** Set the image format configuration */ diff --git a/include/eepp/graphics/particlesystem.hpp b/include/eepp/graphics/particlesystem.hpp index 4d14f1e0e..5eec5935b 100644 --- a/include/eepp/graphics/particlesystem.hpp +++ b/include/eepp/graphics/particlesystem.hpp @@ -37,7 +37,7 @@ enum class ParticleEffect : Uint32 { Callback //!< Callback defined effect. Set the callback before creating the effect. }; -/** @brief Basic but powerfull Particle System */ +/** @brief Basic but powerful Particle System */ class EE_API ParticleSystem { public: typedef std::function ParticleCallback; diff --git a/include/eepp/graphics/primitives.hpp b/include/eepp/graphics/primitives.hpp index 408a096a3..b66288968 100644 --- a/include/eepp/graphics/primitives.hpp +++ b/include/eepp/graphics/primitives.hpp @@ -141,13 +141,13 @@ class EE_API Primitives { /** @return The color used to draw the primitives */ const Color& getColor(); - /** Forcing the draw, will force the batch renderer to draw the batched vertexs immediately ( + /** Forcing the draw, will force the batch renderer to draw the batched vertices immediately ( * active by default ). */ void setForceDraw( const bool& force ); const bool& getForceDraw() const; - /** Force to draw the batched vertexs. */ + /** Force to draw the batched vertices. */ void drawBatch(); /** Set the fill mode used to draw primitives */ diff --git a/include/eepp/graphics/renderer/renderergl.hpp b/include/eepp/graphics/renderer/renderergl.hpp index 415b664c6..34e548718 100644 --- a/include/eepp/graphics/renderer/renderergl.hpp +++ b/include/eepp/graphics/renderer/renderergl.hpp @@ -5,7 +5,7 @@ namespace EE { namespace Graphics { -//! Avoid compilling the fixed pipeline renderer for GLES2, because it's not supported. +//! Avoid compiling the fixed pipeline renderer for GLES2, because it's not supported. #if !defined( EE_GLES2 ) || defined( EE_GLES_BOTH ) class EE_API RendererGL : public Renderer { diff --git a/include/eepp/graphics/rendermode.hpp b/include/eepp/graphics/rendermode.hpp index 62b264855..3e94e0796 100644 --- a/include/eepp/graphics/rendermode.hpp +++ b/include/eepp/graphics/rendermode.hpp @@ -7,8 +7,8 @@ namespace EE { namespace Graphics { enum RenderMode { RENDER_NORMAL = 0, //!< Render the texture without any change RENDER_MIRROR = 1, //!< Render the texture mirrored - RENDER_FLIPPED = 2, //!< Render the texture fliped - RENDER_FLIPPED_MIRRORED = 3, //!< Render the texture fliped and mirrored + RENDER_FLIPPED = 2, //!< Render the texture flipped + RENDER_FLIPPED_MIRRORED = 3, //!< Render the texture flipped and mirrored RENDER_ISOMETRIC = 4, //!< Render the texture as an isometric tile RENDER_ISOMETRIC_VERTICAL = 5, //!< Render the texture as an isometric vertical tile RENDER_ISOMETRIC_VERTICAL_NEGATIVE = diff --git a/include/eepp/graphics/scopedtexture.hpp b/include/eepp/graphics/scopedtexture.hpp index f42f69a68..b5a2141fe 100644 --- a/include/eepp/graphics/scopedtexture.hpp +++ b/include/eepp/graphics/scopedtexture.hpp @@ -5,7 +5,7 @@ namespace EE { namespace Graphics { namespace Private { -/** @brief binds a texture a restores previusly binded texture */ +/** @brief binds a texture a restores previously binded texture */ class EE_API ScopedTexture { public: ScopedTexture( int textureBind = -1 /** with -1 as default it avoid the auto-binding */ ); diff --git a/include/eepp/graphics/shader.hpp b/include/eepp/graphics/shader.hpp index a11b5b780..fb2fb8d92 100644 --- a/include/eepp/graphics/shader.hpp +++ b/include/eepp/graphics/shader.hpp @@ -11,7 +11,7 @@ namespace EE { namespace Graphics { /** @brief The basic shader class. */ class EE_API Shader { public: - /** Activates/Deactivates shader convertion from fixed pipeline to programmable pipeline ( + /** Activates/Deactivates shader conversion from fixed pipeline to programmable pipeline ( * activated by default ) */ static void ensure( bool ensure ); diff --git a/include/eepp/graphics/shaderprogrammanager.hpp b/include/eepp/graphics/shaderprogrammanager.hpp index 2fde167ba..b8c5c031d 100644 --- a/include/eepp/graphics/shaderprogrammanager.hpp +++ b/include/eepp/graphics/shaderprogrammanager.hpp @@ -11,7 +11,7 @@ using namespace EE::System; namespace EE { namespace Graphics { /** @brief The Shader Program Manager is a singleton class that manages all the instances of Shader - Programs instanciated. Releases the Shader Program instances automatically. So the user doesn't + Programs instantiated. Releases the Shader Program instances automatically. So the user doesn't need to release any Shader Program instance. */ class EE_API ShaderProgramManager : public ResourceManager { SINGLETON_DECLARE_HEADERS( ShaderProgramManager ) diff --git a/include/eepp/graphics/sprite.hpp b/include/eepp/graphics/sprite.hpp index bf1f71302..1bd4ec13b 100644 --- a/include/eepp/graphics/sprite.hpp +++ b/include/eepp/graphics/sprite.hpp @@ -39,7 +39,7 @@ class EE_API Sprite : public Drawable { static Sprite* fromGif( IOStream& gif ); - /** Instanciate an empty sprite */ + /** Instantiate an empty sprite */ Sprite(); /** Creates an animated Sprite from a animation name. It will search for a pattern name. @@ -420,7 +420,7 @@ class EE_API Sprite : public Drawable { Color* mVertexColors{ nullptr }; int mRepetitions{ - -1 }; //!< Number of repetions of the animation, default -1 that equals to loop. + -1 }; //!< Number of repetitions of the animation, default -1 that equals to loop. BlendMode mBlend{ BlendMode::Alpha() }; RenderMode mEffect{ RENDER_NORMAL }; diff --git a/include/eepp/graphics/text.hpp b/include/eepp/graphics/text.hpp index 30aa48bc3..d27b1c038 100644 --- a/include/eepp/graphics/text.hpp +++ b/include/eepp/graphics/text.hpp @@ -190,7 +190,7 @@ class EE_API Text { Uint32 getStyle() const; /** @see Set the alpha of each individual character. - ** This doesn't break any custom color per-character setted. */ + ** This doesn't break any custom color per-character set. */ void setAlpha( const Uint8& alpha ); const Color& getFillColor() const; @@ -212,7 +212,7 @@ class EE_API Text { /** @return The cached text height */ Float getTextHeight(); - /** @return The line espacing */ + /** @return The line spacing */ Float getLineSpacing(); /** Draw the cached text on screen */ @@ -325,7 +325,7 @@ class EE_API Text { /** Force to cache the width of the current text */ void cacheWidth(); - static void addLine( std::vector& vertice, Float lineLength, Float lineTop, + static void addLine( std::vector& vertices, Float lineLength, Float lineTop, Float offset, Float thickness, Float outlineThickness, Int32 centerDiffX ); static void addGlyphQuad( std::vector& vertices, Vector2f position, diff --git a/include/eepp/graphics/textureatlasloader.hpp b/include/eepp/graphics/textureatlasloader.hpp index 7beb11cb1..5f9679f94 100644 --- a/include/eepp/graphics/textureatlasloader.hpp +++ b/include/eepp/graphics/textureatlasloader.hpp @@ -137,7 +137,7 @@ class EE_API TextureAtlasLoader { bool updateTextureAtlas( std::string TextureAtlasPath, std::string ImagesPath, Sizei maxImageSize = Sizei::Zero ); - /** Rewrites the texture atlas file. Usefull if the TextureRegions where modified and need to be + /** Rewrites the texture atlas file. Useful if the TextureRegions where modified and need to be * updated inside the texture atlas. */ bool updateTextureAtlas(); diff --git a/include/eepp/graphics/textureatlasmanager.hpp b/include/eepp/graphics/textureatlasmanager.hpp index 5bde3f938..b35151912 100644 --- a/include/eepp/graphics/textureatlasmanager.hpp +++ b/include/eepp/graphics/textureatlasmanager.hpp @@ -12,7 +12,7 @@ using namespace EE::System; namespace EE { namespace Graphics { /** @brief The Texture Atlas Manager is a singleton class that manages all the instances of Texture - Atlases instanciated. Releases the Texture Atlases instances automatically. So the user doesn't + Atlases instantiated. Releases the Texture Atlases instances automatically. So the user doesn't need to release any Texture Atlas instance. */ class EE_API TextureAtlasManager : public ResourceManagerMulti { SINGLETON_DECLARE_HEADERS( TextureAtlasManager ) diff --git a/include/eepp/graphics/texturefactory.hpp b/include/eepp/graphics/texturefactory.hpp index 29043b196..fd9be205f 100644 --- a/include/eepp/graphics/texturefactory.hpp +++ b/include/eepp/graphics/texturefactory.hpp @@ -208,7 +208,7 @@ class EE_API TextureFactory : protected Mutex { /** Get a local copy for all the textures */ void grabTextures(); - /** Reload all the grabed textures */ + /** Reload all the grabbed textures */ void ungrabTextures(); /** Allocate space for Textures (only works if EE_ALLOC_TEXTURES_ON_VECTOR is defined) */ diff --git a/include/eepp/graphics/textureregion.hpp b/include/eepp/graphics/textureregion.hpp index 500ba089e..eabdde324 100644 --- a/include/eepp/graphics/textureregion.hpp +++ b/include/eepp/graphics/textureregion.hpp @@ -94,7 +94,7 @@ class EE_API TextureRegion : public DrawableResource { void setDestSize( const Sizef& destSize ); /** @return The TextureRegion default offset. The offset is added to the position passed when is - * drawed. */ + * drew. */ const Vector2i& getOffset() const; /** Set the TextureRegion offset. */ diff --git a/include/eepp/graphics/vertexbuffer.hpp b/include/eepp/graphics/vertexbuffer.hpp index c255e7d66..c5524c29a 100644 --- a/include/eepp/graphics/vertexbuffer.hpp +++ b/include/eepp/graphics/vertexbuffer.hpp @@ -20,9 +20,9 @@ class EE_API VertexBuffer { *VertexFlags * @param drawType The type of the primitive to draw. * @param reserveVertexSize If the vertex size is known is possible to reserve the space in - *memory to avoid resizeing the array. + *memory to avoid resizing the array. * @param reserveIndexSize If the vertex size is known is possible to reserve the space in - *memory for the indices to avoid resizeing the array. + *memory for the indices to avoid resizing the array. * @param usageType This indicates the kind of usage VBO will have. It's only useful if VBO *extensions are supported ( almost for sure that it's supported ). More information here: *http://www.opengl.org/sdk/docs/man/xhtml/glBufferData.xml @@ -68,18 +68,18 @@ class EE_API VertexBuffer { void addIndex( const Uint32& indexValue ); /** @brief Set a vertex index of the type indicated to the buffer - * @param index The array index of the vertext to set + * @param index The array index of the vertex to set * @param type Can be the position or texture coordinates. * @param vertex The vexter data */ void setVertex( const Uint32& index, const Uint32& type, const Vector2f& vertex ); /** @brief Adds a vertex position to the buffer - * @param index The array index of the vertext to set + * @param index The array index of the vertex to set * @param vertex The vexter data */ void setVertex( const Uint32& index, const Vector2f& vertex ); /** @brief Adds a vertex texture coordinate. - * @param index The array index of the vertext to set + * @param index The array index of the vertex to set * @param vertexCoord The vertex texture coordinate. * @param textureLevel Indicates the texture level if it's using multitextures. */ @@ -87,13 +87,13 @@ class EE_API VertexBuffer { const Uint32& textureLevel = 0 ); /** @brief Adds a color to the buffer. - * @param index The array index of the vertext to set + * @param index The array index of the vertex to set * @param color The color value. */ void setColor( const Uint32& index, const Color& color ); /** @brief Adds an index to the buffer. - * @param index The array index of the vertext to set + * @param index The array index of the vertex to set * @param indexValue The index value. */ void setIndex( const Uint32& index, const Uint32& indexValue ); diff --git a/include/eepp/graphics/view.hpp b/include/eepp/graphics/view.hpp index c25657bb6..e2015957e 100644 --- a/include/eepp/graphics/view.hpp +++ b/include/eepp/graphics/view.hpp @@ -8,7 +8,7 @@ using namespace EE::Math; namespace EE { namespace Graphics { /** @brief The class defines a view like a 2D camera ( position, size, move, scale ). Basically is a - * 2D proyection in pixels seted over a viewport. */ + * 2D projection in pixels seted over a viewport. */ class EE_API View { public: View(); diff --git a/include/eepp/math/interpolation2d.hpp b/include/eepp/math/interpolation2d.hpp index dfec814d7..12339b844 100644 --- a/include/eepp/math/interpolation2d.hpp +++ b/include/eepp/math/interpolation2d.hpp @@ -95,7 +95,7 @@ class EE_API Interpolation2d { /** @return If the animation ended */ bool ended() const; - /** Instead if setting the time between every waypoing, this set a total time for all the + /** Instead if setting the time between every waypoint, this set a total time for all the * movement interpolation. */ Interpolation2d& setDuration( const Time& TotTime ); diff --git a/include/eepp/math/math.hpp b/include/eepp/math/math.hpp index 71b151cb4..9d8db2e5e 100644 --- a/include/eepp/math/math.hpp +++ b/include/eepp/math/math.hpp @@ -14,8 +14,8 @@ inline Uint32 setRandomSeed( Uint32 seed ) { } /** Generate a floating point random number - * @param fMin The minimun value - * @param fMax the maximun value + * @param fMin The minimum value + * @param fMax the maximum value * @return The random number generated */ inline Float randf( const Float& fMin = 0.0f, const Float& fMax = 1.0f ) { @@ -23,24 +23,24 @@ inline Float randf( const Float& fMin = 0.0f, const Float& fMax = 1.0f ) { } /** Generate a integer random number - * @param fMin The minimun value - * @param fMax the maximun value + * @param fMin The minimum value + * @param fMax the maximum value * @return The random number generated */ inline int randi( const int& fMin = 0, const int& fMax = 1 ) { return (int)( fMin + ( fMax - fMin + 1 ) * ( rand() / ( (Float)RAND_MAX + 1 ) ) ); } -/** Cosine from an Angle in Degress */ +/** Cosine from an Angle in Degrees */ inline Float cosAng( const Float& Ang ) { return eecos( Ang * EE_PI_180 ); } -/** Sinus from an Angle in Degress */ +/** Sinus from an Angle in Degrees */ inline Float sinAng( const Float& Ang ) { return eesin( Ang * EE_PI_180 ); } -/** Tangen from an Angle in Degress */ +/** Tangen from an Angle in Degrees */ inline Float tanAng( const Float& Ang ) { return tan( Ang * EE_PI_180 ); } diff --git a/include/eepp/math/polygon2.hpp b/include/eepp/math/polygon2.hpp index 05d1c06a4..dfd93b334 100644 --- a/include/eepp/math/polygon2.hpp +++ b/include/eepp/math/polygon2.hpp @@ -324,7 +324,7 @@ template bool Polygon2::intersect( const Polygon2& p1 ) { max0 += sOffset; if ( ( ( min0 - max1 ) > 0 ) || ( ( min1 - max0 ) > 0 ) ) { - return false; // Found a seperating axis, they can't possibly be touching + return false; // Found a separating axis, they can't possibly be touching } } @@ -360,7 +360,7 @@ template bool Polygon2::intersect( const Polygon2& p1 ) { max0 += sOffset; if ( ( ( min0 - max1 ) > 0 ) || ( ( min1 - max0 ) > 0 ) ) { - return false; // Found a seperating axis, they can't possibly be touching + return false; // Found a separating axis, they can't possibly be touching } } diff --git a/include/eepp/math/rect.hpp b/include/eepp/math/rect.hpp index 002656678..867470b3a 100644 --- a/include/eepp/math/rect.hpp +++ b/include/eepp/math/rect.hpp @@ -359,13 +359,13 @@ template Vector2 tRECT::clampVector( const Vector2& Vect ) } template Vector2 tRECT::wrapVector( const Vector2& Vect ) const { - T ix = eeabs( Right - Left ); - T modx = eemod( Vect.x - Left, ix ); - T x = ( modx > 0 ) ? modx : modx + ix; + T iX = eeabs( Right - Left ); + T modx = eemod( Vect.x - Left, iX ); + T x = ( modx > 0 ) ? modx : modx + iX; - T iy = eeabs( Top - Top ); - T mody = eemod( Vect.y - Top, iy ); - T y = ( mody > 0 ) ? mody : mody + iy; + T iY = eeabs( Top - Top ); + T mody = eemod( Vect.y - Top, iY ); + T y = ( mody > 0 ) ? mody : mody + iY; return Vector2( x + Left, y + Top ); } diff --git a/include/eepp/network/ftp.hpp b/include/eepp/network/ftp.hpp index 155545a4b..7582fc6d9 100644 --- a/include/eepp/network/ftp.hpp +++ b/include/eepp/network/ftp.hpp @@ -19,7 +19,7 @@ class EE_API Ftp : NonCopyable { public: /** @brief Enumeration of transfer modes */ enum TransferMode { - Binary, ///< Binary mode (file is transfered as a sequence of bytes) + Binary, ///< Binary mode (file is transferred as a sequence of bytes) Ascii, ///< Text mode using ASCII encoding Ebcdic ///< Text mode using EBCDIC encoding }; @@ -141,7 +141,7 @@ class EE_API Ftp : NonCopyable { std::string mDirectory; ///< Directory extracted from the response message }; - /** @brief Specialization of FTP response returning a filename lisiting */ + /** @brief Specialization of FTP response returning a filename listing */ class EE_API ListingResponse : public Response { public: /** @brief Default constructor @@ -329,7 +329,7 @@ class EE_API Ftp : NonCopyable { ** @return Server response to the request */ Response getResponse(); - /** @brief Utility class for exchanging datas with the server on the data channel */ + /** @brief Utility class for exchanging data with the server on the data channel */ class DataChannel; friend class DataChannel; @@ -356,7 +356,7 @@ Using the FTP client consists of 4 parts: @li Connecting to the FTP server @li Logging in (either as a registered user or anonymously) @li Sending commands to the server -@li Disconnecting (this part can be done implicitely by the destructor) +@li Disconnecting (this part can be done implicitly by the destructor) Every command returns a FTP response, which contains the status code as well as a message from the server. Some commands such as getWorkingDirectory and getDirectoryListing diff --git a/include/eepp/network/packet.hpp b/include/eepp/network/packet.hpp index 94d23fec9..db9de9aa5 100644 --- a/include/eepp/network/packet.hpp +++ b/include/eepp/network/packet.hpp @@ -187,7 +187,7 @@ in order to send it over the network using sockets (TcpSocket, UdpSocket). Packets solve 2 fundamental problems that arise when -transfering data over the network: +transferring data over the network: @li data is interpreted correctly according to the endianness @li the bounds of the packet are preserved (one send == one receive) diff --git a/include/eepp/network/socketselector.hpp b/include/eepp/network/socketselector.hpp index cebfe52e3..71981acc6 100644 --- a/include/eepp/network/socketselector.hpp +++ b/include/eepp/network/socketselector.hpp @@ -105,7 +105,7 @@ A selector doesn't store its own copies of the sockets (socket classes are not copyable anyway), it simply keeps a reference to the original sockets that you pass to the "add" function. Therefore, you can't use the selector as a -socket container, you must store them oustide and make sure +socket container, you must store them outside and make sure that they are alive as long as they are used in the selector. Using a selector is simple: diff --git a/include/eepp/scene/action.hpp b/include/eepp/scene/action.hpp index 9734ad7dc..357e18c95 100644 --- a/include/eepp/scene/action.hpp +++ b/include/eepp/scene/action.hpp @@ -72,7 +72,7 @@ class EE_API Action { /** Same as Action::addEventListener */ Action* on( const ActionType& actionType, const ActionCallback& callback ); - /** Removes an event listener previusly added. + /** Removes an event listener previously added. * @param callbackId The ID of the event listener returned by the Action::addEventListener call. */ void removeEventListener( const Uint32& callbackId ); diff --git a/include/eepp/scene/actions/fade.hpp b/include/eepp/scene/actions/fade.hpp index 4b92f5262..985706ea4 100644 --- a/include/eepp/scene/actions/fade.hpp +++ b/include/eepp/scene/actions/fade.hpp @@ -10,7 +10,7 @@ class EE_API Fade : public ActionInterpolation1d { public: static Fade* New( const Float& start, const Float& end, const Time& duration, const Ease::Interpolation& type = Ease::Linear, - const bool& alphaChilds = true ); + const bool& alphaChildren = true ); Action* clone() const override; @@ -20,19 +20,19 @@ class EE_API Fade : public ActionInterpolation1d { Fade(); Fade( const Float& start, const Float& end, const Time& duration, - const Ease::Interpolation& type, const bool& alphaChilds ); + const Ease::Interpolation& type, const bool& alphaChildren ); void onStart() override; void onUpdate( const Time& time ) override; - bool mAffectChilds; + bool mAffectChildren; }; class EE_API FadeIn : public Fade { public: static FadeIn* New( const Time& duration, const Ease::Interpolation& type = Ease::Linear, - const bool& alphaChilds = true ); + const bool& alphaChildren = true ); void start() override; @@ -46,13 +46,13 @@ class EE_API FadeIn : public Fade { FadeIn(); - FadeIn( const Time& duration, const Ease::Interpolation& type, const bool& alphaChilds ); + FadeIn( const Time& duration, const Ease::Interpolation& type, const bool& alphaChildren ); }; class EE_API FadeOut : public Fade { public: static FadeOut* New( const Time& duration, const Ease::Interpolation& type = Ease::Linear, - const bool& alphaChilds = true ); + const bool& alphaChildren = true ); void start() override; @@ -66,7 +66,7 @@ class EE_API FadeOut : public Fade { FadeOut(); - FadeOut( const Time& duration, const Ease::Interpolation& type, const bool& alphaChilds ); + FadeOut( const Time& duration, const Ease::Interpolation& type, const bool& alphaChildren ); }; }}} // namespace EE::Scene::Actions diff --git a/include/eepp/scene/event.hpp b/include/eepp/scene/event.hpp index baae9e229..751146e0a 100644 --- a/include/eepp/scene/event.hpp +++ b/include/eepp/scene/event.hpp @@ -55,7 +55,7 @@ class EE_API Event { OnDocumentClosed, OnDocumentReloaded, OnDocumentSyntaxDefinitionChange, - OnDocumentDirtyOnFileSysten, + OnDocumentDirtyOnFileSystem, OnFontStyleChanged, OnPressEnter, OnValueChange, diff --git a/include/eepp/scene/node.hpp b/include/eepp/scene/node.hpp index 06ee003b1..8fc58f472 100644 --- a/include/eepp/scene/node.hpp +++ b/include/eepp/scene/node.hpp @@ -51,7 +51,7 @@ enum NodeFlags { NODE_FLAG_REVERSE_DRAW = ( 1 << 16 ), NODE_FLAG_FRAME_BUFFER = ( 1 << 17 ), NODE_FLAG_CLIP_ENABLE = ( 1 << 18 ), - NODE_FLAG_REPORT_SIZE_CHANGE_TO_CHILDS = ( 1 << 19 ), + NODE_FLAG_REPORT_SIZE_CHANGE_TO_CHILDREN = ( 1 << 19 ), NODE_FLAG_OVER_FIND_ALLOWED = ( 1 << 20 ), NODE_FLAG_SCENENODE = ( 1 << 21 ), @@ -108,7 +108,7 @@ class EE_API Node : public Transformable { Node* setVisible( const bool& visible, bool emitEventNotification = true ); - Node* setChildsVisibility( bool visible, bool emitEventNotification = true ); + Node* setChildrenVisibility( bool visible, bool emitEventNotification = true ); bool isVisible() const; @@ -227,7 +227,7 @@ class EE_API Node : public Transformable { void sendTextEvent( const Uint32& event, const std::string& text ); - void childsCloseAll(); + void closeAllChildren(); const std::string& getId() const; @@ -324,7 +324,7 @@ class EE_API Node : public Transformable { virtual void setAlpha( const Float& alpha ); - virtual void setChildsAlpha( const Float& alpha ); + virtual void setChildrenAlpha( const Float& alpha ); ActionManager* getActionManager() const; @@ -368,9 +368,9 @@ class EE_API Node : public Transformable { void enableReportSizeChangeToChildren(); - void disableReportSizeChangeToChilds(); + void disableReportSizeChangeToChildren(); - bool reportSizeChangeToChilds() const; + bool reportSizeChangeToChildren() const; Node* centerHorizontal(); @@ -411,8 +411,8 @@ class EE_API Node : public Transformable { const Action::UniqueID& uniqueIdentifier = 0 ); //! Does the same as runOnMainThread if called from a none main thread, otherwise it will be - //! executed inmediatelly. - //! @return True if runnable was inmediatelly executed. + //! executed immediately. + //! @return True if runnable was immediately executed. bool ensureMainThread( Actions::Runnable::RunnableFunc runnable, const Action::UniqueID& uniqueIdentifier = 0 ); @@ -606,7 +606,7 @@ class EE_API Node : public Transformable { void setDirty(); - void setChildsDirty(); + void setChildrenDirty(); void clipSmartEnable( const Int32& x, const Int32& y, const Uint32& Width, const Uint32& Height, bool needsClipPlanes ); diff --git a/include/eepp/scene/scenenode.hpp b/include/eepp/scene/scenenode.hpp index 641390f0c..a59818474 100644 --- a/include/eepp/scene/scenenode.hpp +++ b/include/eepp/scene/scenenode.hpp @@ -103,9 +103,9 @@ class EE_API SceneNode : public Node { void removeMouseOverNode( Node* node ); - const bool& getUpdateAllChilds() const; + const bool& getUpdateAllChildren() const; - void setUpdateAllChilds( const bool& updateAllChilds ); + void setUpdateAllChildren( bool updateAllChildren ); const Float& getDPI() const; @@ -126,7 +126,7 @@ class EE_API SceneNode : public Node { bool mFrameBufferBound; bool mUseInvalidation; bool mUseGlobalCursors; - bool mUpdateAllChilds; + bool mUpdateAllChildren; Int32 mResizeCb; bool mDrawDebugData; bool mDrawBoxes; diff --git a/include/eepp/system/directorypack.hpp b/include/eepp/system/directorypack.hpp index c6b8d9d9b..e281525eb 100644 --- a/include/eepp/system/directorypack.hpp +++ b/include/eepp/system/directorypack.hpp @@ -58,7 +58,7 @@ class EE_API DirectoryPack : public Pack { * -1. */ Int32 exists( const std::string& path ); - /** Check the integrity of the pack file. \n If return 0 integrity OK. -1 wrong indentifier. -2 + /** Check the integrity of the pack file. \n If return 0 integrity OK. -1 wrong identifier. -2 * wrong header. */ Int8 checkPack(); diff --git a/include/eepp/system/inifile.hpp b/include/eepp/system/inifile.hpp index 5a35ed7f7..97958da45 100644 --- a/include/eepp/system/inifile.hpp +++ b/include/eepp/system/inifile.hpp @@ -7,7 +7,7 @@ // Rewritten by: Shane Hill // Date: 21/08/2001 // Email: Shane.Hill@dsto.defence.gov.au -// Reason: Remove dependancy on MFC. Code should compile on any +// Reason: Remove dependency on MFC. Code should compile on any // platform. Tested on Windows/Linux/Irix // // Spartan: I made many modifications to the class. So, this is not the original. @@ -136,7 +136,7 @@ class EE_API IniFile { double const defValue = 0.0 ) const; /** Sets value of [keyname] valuename =. - ** Specify the optional paramter as false (0) if you do not want it to create + ** Specify the optional parameter as false (0) if you do not want it to create ** the key if it doesn't exist. @return true if data entered, false otherwise. ** Overloaded to accept std::string, int, and double. */ bool setValue( unsigned const keyID, unsigned const valueID, const std::string& value ); @@ -191,7 +191,7 @@ class EE_API IniFile { bool setValueF( const std::string& keyname, const std::string& valuename, double const value, bool create = true ); - /** Sets a formated value from a keyname and a valuename */ + /** Sets a formatted value from a keyname and a valuename */ bool setValueV( const std::string& keyname, const std::string& valuename, char* format, ... ); /** Deletes specified value. @@ -255,14 +255,14 @@ class EE_API IniFile { bool deleteKeyComments( unsigned const keyID ); bool deleteKeyComments( const std::string& keyname ); - bool iniParsed() { return mIniReaded; } + bool iniParsed() { return mIniRead; } bool keyExists( const std::string& keyname ) const; bool keyValueExists( const std::string& keyname, const std::string& valuename ) const; private: - bool mIniReaded{ false }; + bool mIniRead{ false }; std::string mPath; std::string mBuffer; struct key { diff --git a/include/eepp/system/iostream.hpp b/include/eepp/system/iostream.hpp index 513d52818..31dbb9a18 100644 --- a/include/eepp/system/iostream.hpp +++ b/include/eepp/system/iostream.hpp @@ -22,7 +22,7 @@ class EE_API IOStream { /** @brief Write data to the virtual file ** @param data Data to write in the file - ** @param size Size of the data that needs to be writed */ + ** @param size Size of the data that needs to be written */ virtual ios_size write( const char* data, ios_size size ) = 0; /** @brief Change the current reading position diff --git a/include/eepp/system/iostreamstring.hpp b/include/eepp/system/iostreamstring.hpp index cd6aafa92..7649e02b7 100644 --- a/include/eepp/system/iostreamstring.hpp +++ b/include/eepp/system/iostreamstring.hpp @@ -3,6 +3,7 @@ #include #include +#include namespace EE { namespace System { @@ -32,7 +33,7 @@ class EE_API IOStreamString : public IOStream { /** @return Pointer to the current position in the stream */ const char* getPositionPointer(); - /** @return The pointer to the beggining of the stream */ + /** @return The pointer to the beginning of the stream */ const char* getStreamPointer() const; const std::string& getStream() const; diff --git a/include/eepp/system/log.hpp b/include/eepp/system/log.hpp index 41f0f4b8e..324774f1c 100644 --- a/include/eepp/system/log.hpp +++ b/include/eepp/system/log.hpp @@ -49,7 +49,7 @@ class EE_API Log : protected Mutex { virtual ~Log(); - /** @brief Indicates that the log must be writed to a file when the Log instance is closed. + /** @brief Indicates that the log must be written to a file when the Log instance is closed. ** @param filepath The path to the file to write the log. */ void save( const std::string& filepath = "" ); @@ -73,7 +73,7 @@ class EE_API Log : protected Mutex { ** @param text The text to write */ void writel( const LogLevel& level, const std::string_view& text ); - /** @brief Writes a formated string to the log with a log level. + /** @brief Writes a formatted string to the log with a log level. ** @param level The log level that will try to write. ** @param format The Text format. */ @@ -86,7 +86,7 @@ class EE_API Log : protected Mutex { write( logLevelWithTimestamp( level, result, true ) ); } - /** @brief Writes a formated string to the log */ + /** @brief Writes a formatted string to the log */ template void writef( std::string_view format, Args&&... args ) { auto result = String::format( @@ -95,10 +95,10 @@ class EE_API Log : protected Mutex { write( "\n" ); } - /** @returns A reference of the current writed log. */ + /** @returns A reference of the current written log. */ const std::string& getBuffer() const; - /** @returns If the log Writes are outputed to stdout. */ + /** @returns If the log Writes are outputted to stdout. */ const bool& isLoggingToStdOut() const; /** @brief Enabled or disables to output the Writes to stdout. */ @@ -107,11 +107,11 @@ class EE_API Log : protected Mutex { /** @returns If the file is forced to flush the data on every Write call. */ const bool& isLiveWrite() const; - /** @brief Activate or deactivate to flush the writed data to the log on every Write call. */ + /** @brief Activate or deactivate to flush the written data to the log on every Write call. */ void setLiveWrite( const bool& lw ); /** @brief Adds a reader interface. - ** The reader interface is used to the informed for every writed text to the log. + ** The reader interface is used to the informed for every written text to the log. */ void addLogReader( LogReaderInterface* reader ); diff --git a/include/eepp/system/pack.hpp b/include/eepp/system/pack.hpp index 9aba5b6f2..552d27405 100644 --- a/include/eepp/system/pack.hpp +++ b/include/eepp/system/pack.hpp @@ -62,7 +62,7 @@ class EE_API Pack : protected Mutex { * -1. */ virtual Int32 exists( const std::string& path ) = 0; - /** Check the integrity of the pack file. \n If return 0 integrity OK. -1 wrong indentifier. -2 + /** Check the integrity of the pack file. \n If return 0 integrity OK. -1 wrong identifier. -2 * wrong header. */ virtual Int8 checkPack() = 0; diff --git a/include/eepp/system/packmanager.hpp b/include/eepp/system/packmanager.hpp index ed71c3d27..d7c4f0b9b 100644 --- a/include/eepp/system/packmanager.hpp +++ b/include/eepp/system/packmanager.hpp @@ -7,7 +7,7 @@ namespace EE { namespace System { -/** @brief The Pack Manager keep track of the instanciated Packs. +/** @brief The Pack Manager keep track of the instantiated Packs. It's used to find files from any open pack. */ class EE_API PackManager : protected Container { @@ -16,7 +16,7 @@ class EE_API PackManager : protected Container { public: virtual ~PackManager(); - /** @brief Searchs for the filepath in the packs, if the file is found it will return the pack + /** @brief Searches for the filepath in the packs, if the file is found it will return the pack *that belongs to. * @return The pack where the file exists. If the file is not found, *returns NULL. * @param path The file path to search. */ Pack* exists( std::string& path ); diff --git a/include/eepp/system/pak.hpp b/include/eepp/system/pak.hpp index d2d14e1b5..05ac9566c 100644 --- a/include/eepp/system/pak.hpp +++ b/include/eepp/system/pak.hpp @@ -61,7 +61,7 @@ class EE_API Pak : public Pack { * -1. */ Int32 exists( const std::string& path ); - /** Check the integrity of the pakFile. \n If return 0 integrity OK. -1 wrong indentifier. -2 + /** Check the integrity of the pakFile. \n If return 0 integrity OK. -1 wrong identifier. -2 * wrong header. */ Int8 checkPack(); @@ -82,15 +82,15 @@ class EE_API Pak : public Pack { struct pakHeader { char head[4]; //! Header of the file ( default: 'PACK' ) Uint32 dir_offset; //! Offset to the first pakEntry on the pakFile - Uint32 dir_length; //! Space ocuped by all the pakEntrys ( num of pakEntrys = dir_length / + Uint32 dir_length; //! Space ocuped by all the pakEntries ( num of pakEntries = dir_length / //! sizeof(pakEntry) ) - }; //! The header of the file + }; //! The header of the file struct pakEntry { char filename[56]; //! File name Uint32 file_position; //! The file position on the file ( in bytes ) Uint32 file_length; //! THe file length ( in bytes ) - }; //! The stored file info + }; //! The stored file info struct pakFile { IOStreamFile* fs; diff --git a/include/eepp/system/patternmatcher.hpp b/include/eepp/system/patternmatcher.hpp index 3bfe04fd2..39032827e 100644 --- a/include/eepp/system/patternmatcher.hpp +++ b/include/eepp/system/patternmatcher.hpp @@ -7,7 +7,7 @@ namespace EE { namespace System { -// Inpired in rx-cpp (https://github.com/stevedonovan/rx-cpp/). +// Inspired in rx-cpp (https://github.com/stevedonovan/rx-cpp/). class EE_API PatternMatcher { public: diff --git a/include/eepp/system/process.hpp b/include/eepp/system/process.hpp index 2f321e05e..699e2d470 100644 --- a/include/eepp/system/process.hpp +++ b/include/eepp/system/process.hpp @@ -108,7 +108,7 @@ class EE_API Process { ** ** The only safe way to read from the standard output of a process during it's ** execution is to use the `Option::EnableAsync` option in - ** conjuction with this method. */ + ** conjunction with this method. */ size_t readAllStdOut( std::string& buffer, Time timeout = Time::Zero ); /** @brief Read the standard output from the child process. @@ -118,7 +118,7 @@ class EE_API Process { ** ** The only safe way to read from the standard output of a process during it's ** execution is to use the `Option::EnableAsync` option in - ** conjuction with this method. */ + ** conjunction with this method. */ size_t readStdOut( std::string& buffer ); /** @brief Read the standard output from the child process. @@ -129,7 +129,7 @@ class EE_API Process { ** ** The only safe way to read from the standard output of a process during it's ** execution is to use the `Option::EnableAsync` option in - ** conjuction with this method. */ + ** conjunction with this method. */ size_t readStdOut( char* const buffer, const size_t& size ); /** @brief Read all the standard error from the child process. @@ -139,7 +139,7 @@ class EE_API Process { ** ** The only safe way to read from the standard error of a process during it's ** execution is to use the `Option::EnableAsync` option in - ** conjuction with this method. */ + ** conjunction with this method. */ size_t readAllStdErr( std::string& buffer, Time timeout = Time::Zero ); /** @brief Read the standard error from the child process. @@ -149,7 +149,7 @@ class EE_API Process { ** ** The only safe way to read from the standard error of a process during it's ** execution is to use the `Option::EnableAsync` option in - ** conjuction with this method. */ + ** conjunction with this method. */ size_t readStdErr( std::string& buffer ); /** @brief Read the standard error from the child process. @@ -160,7 +160,7 @@ class EE_API Process { ** ** The only safe way to read from the standard error of a process during it's ** execution is to use the `Option::EnableAsync` option in - ** conjuction with this method. */ + ** conjunction with this method. */ size_t readStdErr( char* const buffer, const size_t& size ); /** @brief Write the standard output from the child process. diff --git a/include/eepp/system/resourceloader.hpp b/include/eepp/system/resourceloader.hpp index d518deec5..dad8ff93f 100644 --- a/include/eepp/system/resourceloader.hpp +++ b/include/eepp/system/resourceloader.hpp @@ -16,7 +16,7 @@ class EE_API ResourceLoader { typedef std::function ResLoadCallback; typedef std::function ObjectLoaderTask; - /** @param MaxThreads Set the maximun simultaneous threads to load resources, THREADS_AUTO will + /** @param MaxThreads Set the maximum simultaneous threads to load resources, THREADS_AUTO will * use the cpu number of cores. */ ResourceLoader( const Uint32& MaxThreads = THREADS_AUTO ); @@ -54,7 +54,7 @@ class EE_API ResourceLoader { * the loaders. */ bool clear(); - /** @return The aproximate percent of progress ( between 0 and 100 ) */ + /** @return The approximate percent of progress ( between 0 and 100 ) */ Float getProgress(); /** @returns The number of resources added to load. */ diff --git a/include/eepp/system/sys.hpp b/include/eepp/system/sys.hpp index 00e76e698..f653a0c70 100644 --- a/include/eepp/system/sys.hpp +++ b/include/eepp/system/sys.hpp @@ -33,7 +33,7 @@ class EE_API Sys { /** @return the current date time */ static std::string getDateTimeStr(); - /** Converts any epoch timestmap to a formatted string. */ + /** Converts any epoch timestamp to a formatted string. */ static std::string epochToString( const Uint64& epochTimestamp, const std::string& format = "%Y-%m-%d %H:%M" ); @@ -108,8 +108,8 @@ class EE_API Sys { /** @return An environment variable */ static std::string getEnv( const std::string& name ); - /** @return A splitted environment variable */ - static std::vector getEnvSplitted( const std::string& name ); + /** @return A split environment variable */ + static std::vector getEnvSplit( const std::string& name ); /** It will attach the console to the parent process console if any. Windows only function. * Other platforms will do nothing. @@ -125,7 +125,7 @@ class EE_API Sys { /** @return The process environment variables */ static std::unordered_map getEnvironmentVariables(); - /** @return The process ids found with the correspoding process / binary / executable name */ + /** @return The process ids found with the corresponding process / binary / executable name */ static std::vector pidof( const std::string& processName ); /** @return A list of the current running processes */ diff --git a/include/eepp/system/threadlocal.hpp b/include/eepp/system/threadlocal.hpp index ee5f96e55..a3cf2b7f9 100644 --- a/include/eepp/system/threadlocal.hpp +++ b/include/eepp/system/threadlocal.hpp @@ -14,7 +14,7 @@ namespace EE { namespace System { class EE_API ThreadLocal : NonCopyable { public: /** @brief Default constructor - ** @param value Optional value to initalize the variable */ + ** @param value Optional value to initialize the variable */ ThreadLocal( void* value = NULL ); ~ThreadLocal(); diff --git a/include/eepp/system/threadlocalptr.hpp b/include/eepp/system/threadlocalptr.hpp index 5ee966358..65f3ad879 100644 --- a/include/eepp/system/threadlocalptr.hpp +++ b/include/eepp/system/threadlocalptr.hpp @@ -9,7 +9,7 @@ namespace EE { namespace System { template class ThreadLocalPtr : private ThreadLocal { public: /** @brief Default constructor - ** @param value Optional value to initalize the variable */ + ** @param value Optional value to initialize the variable */ ThreadLocalPtr( T* value = NULL ); /** @brief Overload of unary operator * @@ -24,7 +24,7 @@ template class ThreadLocalPtr : private ThreadLocal { ** @return Pointed object */ T* operator->() const; - /** @brief Cast operator to implicitely convert the pointer to its raw pointer type (T*) + /** @brief Cast operator to implicitly convert the pointer to its raw pointer type (T*) ** @return Pointer to the actual object */ operator T*() const; diff --git a/include/eepp/system/zip.hpp b/include/eepp/system/zip.hpp index 3a6632975..a0b04b6df 100644 --- a/include/eepp/system/zip.hpp +++ b/include/eepp/system/zip.hpp @@ -59,7 +59,7 @@ class EE_API Zip : public Pack { * -1. */ Int32 exists( const std::string& path ); - /** Check the integrity of the pack file. \n If return 0 integrity OK. -1 wrong indentifier. -2 + /** Check the integrity of the pack file. \n If return 0 integrity OK. -1 wrong identifier. -2 * wrong header. */ Int8 checkPack(); diff --git a/include/eepp/ui/doc/textdocument.hpp b/include/eepp/ui/doc/textdocument.hpp index 912802c9b..8d4c89b9a 100644 --- a/include/eepp/ui/doc/textdocument.hpp +++ b/include/eepp/ui/doc/textdocument.hpp @@ -38,9 +38,9 @@ struct DocumentContentChange { class EE_API TextDocument { public: - static bool isTextDocummentCommand( std::string_view cmd ); + static bool isTextDocumentCommand( std::string_view cmd ); - static bool isTextDocummentCommand( String::HashType cmdHash ); + static bool isTextDocumentCommand( String::HashType cmdHash ); static bool fileMightBeBinary( const std::string& file ); @@ -788,10 +788,10 @@ class EE_API TextDocument { void notifySyntaxDefinitionChange(); - void notifiyDocumenLineMove( const Int64& fromLine, const Int64& toLine, + void notifyDocumentLineMove( const Int64& fromLine, const Int64& toLine, const Int64& numLines ); - void notifyInterstingCursorChange( TextPosition selection ); + void notifyInterestingCursorChange( TextPosition selection ); void notifyFoldRegionsUpdated( size_t oldCount, size_t newCount ); diff --git a/include/eepp/ui/models/filesystemmodel.hpp b/include/eepp/ui/models/filesystemmodel.hpp index 1a7652e7f..37d8080e6 100644 --- a/include/eepp/ui/models/filesystemmodel.hpp +++ b/include/eepp/ui/models/filesystemmodel.hpp @@ -130,7 +130,7 @@ class EE_API FileSystemModel : public Model { void rename( const FileInfo& file ); - void updateChilds( const FileInfo& oldParentFile, const FileInfo& newParentFile ); + void updateChildren( const FileInfo& oldParentFile, const FileInfo& newParentFile ); friend class FileSystemModel; std::string mName; @@ -211,7 +211,7 @@ class EE_API FileSystemModel : public Model { protected: std::atomic mInitOK; - std::atomic mShutingDown{ false }; + std::atomic mShuttingDown{ false }; std::string mRootPath; std::string mRealRootPath; std::unique_ptr mRoot{ nullptr }; diff --git a/include/eepp/ui/models/model.hpp b/include/eepp/ui/models/model.hpp index 82281fa2a..ec0c30ca5 100644 --- a/include/eepp/ui/models/model.hpp +++ b/include/eepp/ui/models/model.hpp @@ -156,9 +156,9 @@ class EE_API Model { void releaseResourceMutex(); - Uint32 subsribeModelStyler( const ModelStyler& styler ); + Uint32 subscribeModelStyler( const ModelStyler& styler ); - void unsubsribeModelStyler( Uint32 id ); + void unsubscribeModelStyler( Uint32 id ); protected: Model() {}; diff --git a/include/eepp/ui/models/modelrole.hpp b/include/eepp/ui/models/modelrole.hpp index f91752f1f..542c5d9e4 100644 --- a/include/eepp/ui/models/modelrole.hpp +++ b/include/eepp/ui/models/modelrole.hpp @@ -1,5 +1,5 @@ -#ifndef EE_UI_MODLE_MODELROLE_HPP -#define EE_UI_MODLE_MODELROLE_HPP +#ifndef EE_UI_MODULE_MODELROLE_HPP +#define EE_UI_MODULE_MODELROLE_HPP namespace EE { namespace UI { namespace Models { @@ -7,4 +7,4 @@ enum class ModelRole { Display, Icon, Sort, Class, Tooltip, TooltipClass, Data, }}} // namespace EE::UI::Models -#endif // EE_UI_MODLE_MODELROLE_HPP +#endif // EE_UI_MODULE_MODELROLE_HPP diff --git a/include/eepp/ui/uicodeeditor.hpp b/include/eepp/ui/uicodeeditor.hpp index 3c0ed8fee..1cb2da78c 100644 --- a/include/eepp/ui/uicodeeditor.hpp +++ b/include/eepp/ui/uicodeeditor.hpp @@ -176,7 +176,7 @@ class EE_API UICodeEditor : public UIWidget, public TextDocument::Client { struct MinimapConfig { Float width{ 100 }; // dp width Float maxPercentWidth{ - 0.1f }; // 0..1 max width that a minimap can ocupy on the editor view. + 0.1f }; // 0..1 max width that a minimap can occupy on the editor view. Float scale{ 1 }; int tabWidth{ 4 }; bool drawBackground{ true }; @@ -784,7 +784,7 @@ class EE_API UICodeEditor : public UIWidget, public TextDocument::Client { bool isCursorVisible() const; void setDisableCursorBlinkingAfterAMinuteOfInactivity( - bool diableCursorBlinkingAfterAMinuteOfInactivity ); + bool disableCursorBlinkingAfterAMinuteOfInactivity ); bool isCursorBlinkingAfterAMinuteOfInactivityDisabled() const; @@ -1077,7 +1077,7 @@ class EE_API UICodeEditor : public UIWidget, public TextDocument::Client { void disableEditorFeatures(); - void udpateGlyphWidth(); + void updateGlyphWidth(); Drawable* findIcon( const std::string& name ); diff --git a/include/eepp/ui/uiconsole.hpp b/include/eepp/ui/uiconsole.hpp index 83231ee24..2f57a6d8f 100644 --- a/include/eepp/ui/uiconsole.hpp +++ b/include/eepp/ui/uiconsole.hpp @@ -107,7 +107,7 @@ class EE_API UIConsole : public UIWidget, /** Add Text to Console */ void pushText( const String& str ); - /** Add formated Text to console */ + /** Add formatted Text to console */ template void pushText( std::string_view format, Args&&... args ) { pushText( String::format( format, FormatArg>::get( std::forward( args ) )... ) ); diff --git a/include/eepp/ui/uilinearlayout.hpp b/include/eepp/ui/uilinearlayout.hpp index de11b9315..bd6697d57 100644 --- a/include/eepp/ui/uilinearlayout.hpp +++ b/include/eepp/ui/uilinearlayout.hpp @@ -52,9 +52,9 @@ class EE_API UILinearLayout : public UILayout { Sizei getTotalUsedSize(); - void applyWidthPolicyOnChilds(); + void applyWidthPolicyOnChildren(); - void applyHeightPolicyOnChilds(); + void applyHeightPolicyOnChildren(); }; }} // namespace EE::UI diff --git a/include/eepp/ui/uilistbox.hpp b/include/eepp/ui/uilistbox.hpp index d13a10721..fb499ffc5 100644 --- a/include/eepp/ui/uilistbox.hpp +++ b/include/eepp/ui/uilistbox.hpp @@ -196,7 +196,7 @@ class EE_API UIListBox : public UITouchDraggableWidget { virtual void onTouchDragValueChange( Vector2f diff ); - virtual bool isTouchOverAllowedChilds(); + virtual bool isTouchOverAllowedChildren(); }; }} // namespace EE::UI diff --git a/include/eepp/ui/uinode.hpp b/include/eepp/ui/uinode.hpp index 596fbc188..b94a95413 100644 --- a/include/eepp/ui/uinode.hpp +++ b/include/eepp/ui/uinode.hpp @@ -189,7 +189,7 @@ class EE_API UINode : public Node { virtual UINode* setThemeSkin( const std::string& skinName ); - void setThemeToChilds( UITheme* Theme ); + void setThemeToChildren( UITheme* Theme ); UISkin* getSkin() const; diff --git a/include/eepp/ui/uiscrollbar.hpp b/include/eepp/ui/uiscrollbar.hpp index 5c037b2b8..4b384f56d 100644 --- a/include/eepp/ui/uiscrollbar.hpp +++ b/include/eepp/ui/uiscrollbar.hpp @@ -92,7 +92,7 @@ class EE_API UIScrollBar : public UIWidget { virtual void onAutoSize(); - void adjustChilds(); + void adjustChildren(); void onValueChangeCb( const Event* Event ); diff --git a/include/eepp/ui/uiscrollview.hpp b/include/eepp/ui/uiscrollview.hpp index d38c1a05c..38c4cd287 100644 --- a/include/eepp/ui/uiscrollview.hpp +++ b/include/eepp/ui/uiscrollview.hpp @@ -90,7 +90,7 @@ class EE_API UIScrollView : public UITouchDraggableWidget { virtual void onTouchDragValueChange( Vector2f diff ); - virtual bool isTouchOverAllowedChilds(); + virtual bool isTouchOverAllowedChildren(); }; }} // namespace EE::UI diff --git a/include/eepp/ui/uislider.hpp b/include/eepp/ui/uislider.hpp index a7ad885e0..cb67f4745 100644 --- a/include/eepp/ui/uislider.hpp +++ b/include/eepp/ui/uislider.hpp @@ -52,13 +52,13 @@ class EE_API UISlider : public UIWidget { UIWidget* getSliderButton() const; - void adjustChilds(); + void adjustChildren(); void manageClick( const Uint32& flags ); UIOrientation getOrientation() const; - UISlider* setOrientation( const UIOrientation& orientation, std::string childsBaseTag = "" ); + UISlider* setOrientation( const UIOrientation& orientation, std::string childrenBaseTag = "" ); bool getAllowHalfSliderOut() const; diff --git a/include/eepp/ui/uispinbox.hpp b/include/eepp/ui/uispinbox.hpp index e16b92e82..82b64586c 100644 --- a/include/eepp/ui/uispinbox.hpp +++ b/include/eepp/ui/uispinbox.hpp @@ -71,7 +71,7 @@ class EE_API UISpinBox : public UIWidget { double mClickStep; bool mModifyingVal; - void adjustChilds(); + void adjustChildren(); virtual void onSizeChange(); diff --git a/include/eepp/ui/uistacklayout.hpp b/include/eepp/ui/uistacklayout.hpp index 9549bcbe9..07e079a21 100644 --- a/include/eepp/ui/uistacklayout.hpp +++ b/include/eepp/ui/uistacklayout.hpp @@ -45,7 +45,7 @@ class EE_API UIStackLayout : public UILayout { virtual Uint32 onMessage( const NodeMessage* Msg ); - void applySizePolicyOnChilds(); + void applySizePolicyOnChildren(); void setRowValign( const std::string& rowValign ); diff --git a/include/eepp/ui/uistyle.hpp b/include/eepp/ui/uistyle.hpp index 37d84c1a9..3b2a2e47a 100644 --- a/include/eepp/ui/uistyle.hpp +++ b/include/eepp/ui/uistyle.hpp @@ -71,7 +71,7 @@ class EE_API UIStyle : public UIState { void removeStructurallyVolatileChild( UIWidget* widget ); - UnorderedSet& getStructurallyVolatileChilds(); + UnorderedSet& getStructurallyVolatileChildren(); bool hasProperty( const CSS::PropertyId& propertyId ) const; @@ -88,7 +88,7 @@ class EE_API UIStyle : public UIState { CSS::AnimationsMap mAnimations; UnorderedSet mRelatedWidgets; UnorderedSet mSubscribedWidgets; - UnorderedSet mStructurallyVolatileChilds; + UnorderedSet mStructurallyVolatileChildren; Uint32 mStateDepthCounter{ 0 }; Uint64 mLoadedVersion{ 0 }; const CSS::StyleSheet* mLoadedStyleSheet{ nullptr }; diff --git a/include/eepp/ui/uitheme.hpp b/include/eepp/ui/uitheme.hpp index 69f380a69..9c38dd3b0 100644 --- a/include/eepp/ui/uitheme.hpp +++ b/include/eepp/ui/uitheme.hpp @@ -40,10 +40,10 @@ class EE_API UITheme : protected ResourceManagerMulti { static UITheme* loadFromTextureAtlas( Graphics::TextureAtlas* getTextureAtlas, const std::string& Name, const std::string& NameAbbr ); - static UITheme* loadFromDirectroy( UITheme* tTheme, const std::string& Path, + static UITheme* loadFromDirectory( UITheme* tTheme, const std::string& Path, const Float& pixelDensity = 1 ); - static UITheme* loadFromDirectroy( const std::string& Path, const std::string& Name, + static UITheme* loadFromDirectory( const std::string& Path, const std::string& Name, const std::string& NameAbbr, const Float& pixelDensity = 1 ); virtual ~UITheme(); diff --git a/include/eepp/ui/uitouchdraggablewidget.hpp b/include/eepp/ui/uitouchdraggablewidget.hpp index 2da5e334b..b498d45d0 100644 --- a/include/eepp/ui/uitouchdraggablewidget.hpp +++ b/include/eepp/ui/uitouchdraggablewidget.hpp @@ -45,7 +45,7 @@ class EE_API UITouchDraggableWidget : public UIWidget { virtual void onTouchDragValueChange( Vector2f diff ); - virtual bool isTouchOverAllowedChilds(); + virtual bool isTouchOverAllowedChildren(); virtual void scheduledUpdate( const Time& time ); diff --git a/include/eepp/ui/uitreeview.hpp b/include/eepp/ui/uitreeview.hpp index d794d07c9..88eaa0be3 100644 --- a/include/eepp/ui/uitreeview.hpp +++ b/include/eepp/ui/uitreeview.hpp @@ -111,7 +111,7 @@ class EE_API UITreeView : public UIAbstractTableView { bool getDisableCellClipping() const; - void setDisableCellClipping( bool disableCellCliping ); + void setDisableCellClipping( bool disableCellClipping ); void clearViewMetadata(); diff --git a/include/eepp/ui/uiviewpager.hpp b/include/eepp/ui/uiviewpager.hpp index 1587ff9ee..f551518ca 100644 --- a/include/eepp/ui/uiviewpager.hpp +++ b/include/eepp/ui/uiviewpager.hpp @@ -43,7 +43,7 @@ class EE_API UIViewPager : public UIWidget { const Float& getMaxEdgeResistance() const; /** The normalized porcentage (0..1) that the edge pages are allowed to go outside the limits. - * Default 0% ( childs can't go outside the edge limits ). + * Default 0% ( children can't go outside the edge limits ). */ void setMaxEdgeResistance( const Float& maxEdgeResistance ); @@ -90,7 +90,7 @@ class EE_API UIViewPager : public UIWidget { virtual Uint32 onMessage( const NodeMessage* Msg ); - void updateChilds(); + void updateChildren(); void limitDisplacement(); diff --git a/include/eepp/ui/uiwidget.hpp b/include/eepp/ui/uiwidget.hpp index 0dbd5dca5..097296af2 100644 --- a/include/eepp/ui/uiwidget.hpp +++ b/include/eepp/ui/uiwidget.hpp @@ -199,7 +199,7 @@ class EE_API UIWidget : public UINode { UIStyle* getUIStyle() const; - void reloadStyle( bool reloadChilds = true, bool disableAnimations = false, + void reloadStyle( bool reloadChildren = true, bool disableAnimations = false, bool reportStateChange = true, bool forceReApplyProperties = false, bool resetPropertyCache = false ); diff --git a/include/eepp/ui/uiwidgettable.hpp b/include/eepp/ui/uiwidgettable.hpp index 2b1164e51..6bb735041 100644 --- a/include/eepp/ui/uiwidgettable.hpp +++ b/include/eepp/ui/uiwidgettable.hpp @@ -144,7 +144,7 @@ class EE_API UIWidgetTable : public UITouchDraggableWidget { virtual void onTouchDragValueChange( Vector2f diff ); - virtual bool isTouchOverAllowedChilds(); + virtual bool isTouchOverAllowedChildren(); void updatePageStep(); }; diff --git a/include/eepp/ui/undostack.hpp b/include/eepp/ui/undostack.hpp index 03093cc68..cfcf12f9e 100644 --- a/include/eepp/ui/undostack.hpp +++ b/include/eepp/ui/undostack.hpp @@ -40,7 +40,7 @@ class EE_API UndoCommand : public NonCopyable { protected: friend class UndoStack; - std::vector mChilds; + std::vector mChildren; std::string mText; std::string mActionText; int mId{ -1 }; diff --git a/include/eepp/window/cursormanager.hpp b/include/eepp/window/cursormanager.hpp index cd8f9b553..00b4a81f5 100644 --- a/include/eepp/window/cursormanager.hpp +++ b/include/eepp/window/cursormanager.hpp @@ -88,7 +88,7 @@ class EE_API CursorManager { ** @see SetGlobalCursor */ virtual void set( Cursor::Type cursor ); - /** A Global Cursor is a cursor setted to be used in eepp. It's the system cursor of the engine. + /** A Global Cursor is a cursor set to be used in eepp. It's the system cursor of the engine. ** The global cursor can be a Cursor ( user created cursor ) or a system cursor ( the OS cursor *). * The system cursor is used by default, but can be override it with this function. */ virtual void setGlobalCursor( Cursor::Type cursor, Cursor* fromCursor ); @@ -111,7 +111,7 @@ class EE_API CursorManager { /** @return If the cursor is visible in the window */ virtual bool getVisible(); - /** @return A pointer to the curent cursor */ + /** @return A pointer to the current cursor */ Cursor* getCurrent() const; /** @return The current system cursor */ diff --git a/include/eepp/window/joycodes.hpp b/include/eepp/window/joycodes.hpp index cc0dbf5c1..9d29a4cca 100644 --- a/include/eepp/window/joycodes.hpp +++ b/include/eepp/window/joycodes.hpp @@ -16,7 +16,7 @@ enum JoystickHatPosition { HAT_LEFTDOWN = ( HAT_LEFT | HAT_DOWN ) }; -/** @enum JoystickAxis enumarates the joysticks axis */ +/** @enum JoystickAxis enumerates the joysticks axis */ enum JoystickAxis { AXIS_X = 0, AXIS_Y = 1, AXIS_X2 = 3, AXIS_Y2 = 2 }; #define AXIS_MAX ( 1 ) diff --git a/include/eepp/window/joystick.hpp b/include/eepp/window/joystick.hpp index 1971793c6..359d73914 100644 --- a/include/eepp/window/joystick.hpp +++ b/include/eepp/window/joystick.hpp @@ -41,7 +41,7 @@ class EE_API Joystick { /** @return True if the joystick is plugged in */ virtual bool isPlugged() const = 0; - /** ReOpen the joysick ( this is the same of doing Close and the Open ) */ + /** ReOpen the joystick ( this is the same of doing Close and the Open ) */ virtual void reOpen(); /** @return The number of hats */ diff --git a/include/eepp/window/keycodes.hpp b/include/eepp/window/keycodes.hpp index d65f7b535..a41c5d87d 100644 --- a/include/eepp/window/keycodes.hpp +++ b/include/eepp/window/keycodes.hpp @@ -13,7 +13,7 @@ namespace EE { namespace Window { // eepp used to support several backends (SDL, SFML, Allegro), but ended up // always using SDL2 since it became the most stable and feature rich of them // So now the architecture is still open to new backends but I decided to -// deprecate all the other backends since it was just a waste of time mantaining +// deprecate all the other backends since it was just a waste of time maintaining // them. /** diff --git a/include/eepp/window/platformimpl.hpp b/include/eepp/window/platformimpl.hpp index 112c33744..16fa0c1ed 100644 --- a/include/eepp/window/platformimpl.hpp +++ b/include/eepp/window/platformimpl.hpp @@ -30,7 +30,7 @@ using namespace EE::Window; using namespace EE::Graphics; /** This is an abstraction of some platform specific implementations - * It's not garanteed that everything is implemented in every platform. + * It's not guaranteed that everything is implemented in every platform. * X11 and Win32 implementation are complete, OS X implementation still lacks of most features. */ class PlatformImpl { diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index aa9620f74..201e2b95e 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/src/eepp/graphics/batchrenderer.cpp b/src/eepp/graphics/batchrenderer.cpp index 7147f0d5d..92c083aa9 100644 --- a/src/eepp/graphics/batchrenderer.cpp +++ b/src/eepp/graphics/batchrenderer.cpp @@ -15,12 +15,12 @@ BatchRenderer* BatchRenderer::New( const unsigned int& Prealloc ) { } BatchRenderer::BatchRenderer() { - allocVertexs( 4096 ); + allocVertices( 4096 ); init(); } BatchRenderer::BatchRenderer( const unsigned int& Prealloc ) { - allocVertexs( Prealloc ); + allocVertices( Prealloc ); init(); } @@ -32,7 +32,7 @@ void BatchRenderer::init() { quadsBegin(); } -void BatchRenderer::allocVertexs( const unsigned int& size ) { +void BatchRenderer::allocVertices( const unsigned int& size ) { eeSAFE_DELETE_ARRAY( mVertex ); mVertex = eeNewArray( VertexData, size ); mVertexSize = size; @@ -64,7 +64,7 @@ void BatchRenderer::setBlendMode( const BlendMode& blend ) { mBlend = blend; } -void BatchRenderer::addVertexs( const unsigned int& num ) { +void BatchRenderer::addVertices( const unsigned int& num ) { mNumVertex += num; if ( ( mNumVertex + num ) >= mVertexSize ) { @@ -190,7 +190,7 @@ void BatchRenderer::batchQuad( const Float& x, const Float& y, const Float& widt mTVertex->tex = mTexCoord[3]; mTVertex->color = mVerColor[3]; - addVertexs( 4 ); + addVertices( 4 ); } else { mTVertex = &mVertex[mNumVertex]; mTVertex->pos.x = x; @@ -226,7 +226,7 @@ void BatchRenderer::batchQuad( const Float& x, const Float& y, const Float& widt mTVertex->tex = mTexCoord[3]; mTVertex->color = mVerColor[3]; - addVertexs( 6 ); + addVertices( 6 ); } } @@ -261,7 +261,7 @@ void BatchRenderer::batchQuad( const Rectf& rect ) { mTVertex->tex = mTexCoord[3]; mTVertex->color = mVerColor[3]; - addVertexs( 4 ); + addVertices( 4 ); } else { mTVertex = &mVertex[mNumVertex]; mTVertex->pos.x = rect.Left; @@ -297,7 +297,7 @@ void BatchRenderer::batchQuad( const Rectf& rect ) { mTVertex->tex = mTexCoord[3]; mTVertex->color = mVerColor[3]; - addVertexs( 6 ); + addVertices( 6 ); } } @@ -353,7 +353,7 @@ void BatchRenderer::batchQuadEx( Float x, Float y, Float width, Float height, Fl mTVertex->color = mVerColor[3]; rotate( originPoint, &mTVertex->pos, angle ); - addVertexs( 4 ); + addVertices( 4 ); } else { mTVertex = &mVertex[mNumVertex]; mTVertex->pos.x = x; @@ -393,7 +393,7 @@ void BatchRenderer::batchQuadEx( Float x, Float y, Float width, Float height, Fl mTVertex->tex = mTexCoord[3]; mTVertex->color = mVerColor[3]; - addVertexs( 6 ); + addVertices( 6 ); } } @@ -430,7 +430,7 @@ void BatchRenderer::batchQuadFree( const Float& x0, const Float& y0, const Float mTVertex->tex = mTexCoord[3]; mTVertex->color = mVerColor[3]; - addVertexs( 4 ); + addVertices( 4 ); } else { mTVertex = &mVertex[mNumVertex]; mTVertex->pos.x = x1; @@ -468,7 +468,7 @@ void BatchRenderer::batchQuadFree( const Float& x0, const Float& y0, const Float mTVertex->tex = mTexCoord[3]; mTVertex->color = mVerColor[3]; - addVertexs( 6 ); + addVertices( 6 ); } } @@ -523,7 +523,7 @@ void BatchRenderer::batchQuadFreeEx( const Float& x0, const Float& y0, const Flo mTVertex->tex = mTexCoord[3]; mTVertex->color = mVerColor[3]; - addVertexs( 4 ); + addVertices( 4 ); } else { mTVertex = &mVertex[mNumVertex]; mTVertex->pos.x = mQ[1].x; @@ -561,7 +561,7 @@ void BatchRenderer::batchQuadFreeEx( const Float& x0, const Float& y0, const Flo mTVertex->tex = mTexCoord[3]; mTVertex->color = mVerColor[3]; - addVertexs( 6 ); + addVertices( 6 ); } } @@ -650,7 +650,7 @@ void BatchRenderer::batchPoint( const Float& x, const Float& y, mTVertex->tex = mTexCoord[0]; mTVertex->color = mVerColor[0]; - addVertexs( 1 ); + addVertices( 1 ); } void BatchRenderer::batchPointList( const std::vector& points, @@ -659,7 +659,7 @@ void BatchRenderer::batchPointList( const std::vector& points, unsigned int curNumVertex = mNumVertex; - addVertexs( points.size() ); + addVertices( points.size() ); memcpy( (void*)&mVertex[curNumVertex], (void*)&points[0], sizeof( VertexData ) * points.size() ); @@ -698,7 +698,7 @@ void BatchRenderer::batchLine( const Float& x0, const Float& y0, const Float& x1 mTVertex->tex = mTexCoord[1]; mTVertex->color = mVerColor[1]; - addVertexs( 2 ); + addVertices( 2 ); } void BatchRenderer::lineLoopBegin() { @@ -734,7 +734,7 @@ void BatchRenderer::batchLineLoop( const Float& x0, const Float& y0, const Float mTVertex->tex = mTexCoord[1]; mTVertex->color = mVerColor[1]; - addVertexs( 2 ); + addVertices( 2 ); } void BatchRenderer::batchLineLoop( const Vector2f& vector1, const Vector2f& vector2 ) { @@ -753,7 +753,7 @@ void BatchRenderer::batchLineLoop( const Float& x0, const Float& y0 ) { mTVertex->tex = mTexCoord[0]; mTVertex->color = mVerColor[0]; - addVertexs( 1 ); + addVertices( 1 ); } void BatchRenderer::batchLineLoop( const Vector2f& vector1 ) { @@ -793,7 +793,7 @@ void BatchRenderer::batchLineStrip( const Float& x0, const Float& y0, const Floa mTVertex->tex = mTexCoord[1]; mTVertex->color = mVerColor[1]; - addVertexs( 2 ); + addVertices( 2 ); } void BatchRenderer::batchLineStrip( const Vector2f& vector1, const Vector2f& vector2 ) { @@ -812,7 +812,7 @@ void BatchRenderer::batchLineStrip( const Float& x0, const Float& y0 ) { mTVertex->tex = mTexCoord[0]; mTVertex->color = mVerColor[0]; - addVertexs( 1 ); + addVertices( 1 ); } void BatchRenderer::batchLineStrip( const Vector2f& vector1 ) { @@ -870,7 +870,7 @@ void BatchRenderer::batchTriangleFan( const Float& x0, const Float& y0, const Fl mTVertex->tex = mTexCoord[2]; mTVertex->color = mVerColor[2]; - addVertexs( 3 ); + addVertices( 3 ); } void BatchRenderer::batchTriangleFan( const Float& x0, const Float& y0 ) { @@ -885,7 +885,7 @@ void BatchRenderer::batchTriangleFan( const Float& x0, const Float& y0 ) { mTVertex->tex = mTexCoord[0]; mTVertex->color = mVerColor[0]; - addVertexs( 1 ); + addVertices( 1 ); } void BatchRenderer::trianglesBegin() { @@ -939,7 +939,7 @@ void BatchRenderer::batchTriangle( const Float& x0, const Float& y0, const Float mTVertex->tex = mTexCoord[2]; mTVertex->color = mVerColor[2]; - addVertexs( 3 ); + addVertices( 3 ); } void BatchRenderer::polygonSetColor( const Color& Color ) { @@ -959,7 +959,7 @@ void BatchRenderer::batchPolygon( const Polygon2f& Polygon ) { mTVertex->tex = mTexCoord[0]; mTVertex->color = mVerColor[0]; - addVertexs( 1 ); + addVertices( 1 ); } } @@ -975,7 +975,7 @@ void BatchRenderer::batchPolygonByPoint( const Float& x, const Float& y ) { mTVertex->tex = mTexCoord[0]; mTVertex->color = mVerColor[0]; - addVertexs( 1 ); + addVertices( 1 ); } void BatchRenderer::batchPolygonByPoint( const Vector2f& Vector ) { diff --git a/src/eepp/graphics/globalbatchrenderer.cpp b/src/eepp/graphics/globalbatchrenderer.cpp index 39253129b..296675d02 100644 --- a/src/eepp/graphics/globalbatchrenderer.cpp +++ b/src/eepp/graphics/globalbatchrenderer.cpp @@ -5,7 +5,7 @@ namespace EE { namespace Graphics { SINGLETON_DECLARE_IMPLEMENTATION( GlobalBatchRenderer ) GlobalBatchRenderer::GlobalBatchRenderer() { - allocVertexs( 4096 ); + allocVertices( 4096 ); } GlobalBatchRenderer::~GlobalBatchRenderer() {} diff --git a/src/eepp/graphics/text.cpp b/src/eepp/graphics/text.cpp index e546f17c0..11b7e4e3f 100644 --- a/src/eepp/graphics/text.cpp +++ b/src/eepp/graphics/text.cpp @@ -2350,7 +2350,7 @@ void Text::setFillColor( const Color& color, Uint32 from, Uint32 to ) { } if ( from <= to && from < s && to <= s ) { - size_t rto = to + 1; + size_t realTo = to + 1; Int32 rpos = from; Int32 lpos = 0; Uint32 i; @@ -2376,7 +2376,7 @@ void Text::setFillColor( const Color& color, Uint32 from, Uint32 to ) { } } - for ( i = from; i < rto; i++ ) { + for ( i = from; i < realTo; i++ ) { curChar = mString[i]; lpos = rpos; diff --git a/src/eepp/graphics/textureatlasloader.cpp b/src/eepp/graphics/textureatlasloader.cpp index 60d2083eb..5be442416 100644 --- a/src/eepp/graphics/textureatlasloader.cpp +++ b/src/eepp/graphics/textureatlasloader.cpp @@ -238,7 +238,7 @@ void TextureAtlasLoader::createTextureRegions() { if ( NULL != tTex ) mTexturesLoaded.push_back( tTex ); - // Create the Texture Atlas with the name of the real texture, not the Childs ( example + // Create the Texture Atlas with the name of the real texture, not the Children ( example // load 1.png and not 1_ch1.png ) if ( 0 == z ) { if ( mTexGrHdr.Flags & HDR_TEXTURE_ATLAS_REMOVE_EXTENSION ) diff --git a/src/eepp/scene/actions/fade.cpp b/src/eepp/scene/actions/fade.cpp index 6bb555e40..b8168eda6 100644 --- a/src/eepp/scene/actions/fade.cpp +++ b/src/eepp/scene/actions/fade.cpp @@ -4,15 +4,15 @@ namespace EE { namespace Scene { namespace Actions { Fade* Fade::New( const Float& start, const Float& end, const Time& duration, - const Ease::Interpolation& type, const bool& alphaChilds ) { - return eeNew( Fade, ( start, end, duration, type, alphaChilds ) ); + const Ease::Interpolation& type, const bool& alphaChildren ) { + return eeNew( Fade, ( start, end, duration, type, alphaChildren ) ); } -Fade::Fade() : mAffectChilds( true ) {} +Fade::Fade() : mAffectChildren( true ) {} Fade::Fade( const Float& start, const Float& end, const Time& duration, - const Ease::Interpolation& type, const bool& alphaChilds ) : - mAffectChilds( alphaChilds ) { + const Ease::Interpolation& type, const bool& alphaChildren ) : + mAffectChildren( alphaChildren ) { mInterpolation.clear().add( start, duration ).add( end ).setType( type ); } @@ -20,7 +20,7 @@ void Fade::onStart() { if ( NULL != mNode ) { mNode->setAlpha( mInterpolation.getPosition() ); - if ( mAffectChilds ) { + if ( mAffectChildren ) { Node* CurChild = mNode->getFirstChild(); while ( NULL != CurChild ) { @@ -39,26 +39,26 @@ void Fade::onUpdate( const Time& ) { Action* Fade::clone() const { Fade* action = eeNew( Fade, () ); - action->mAffectChilds = mAffectChilds; + action->mAffectChildren = mAffectChildren; action->setInterpolation( mInterpolation ); return action; } Action* Fade::reverse() const { Fade* action = eeNew( Fade, () ); - action->mAffectChilds = mAffectChilds; + action->mAffectChildren = mAffectChildren; action->setInterpolation( Interpolation1d( mInterpolation.getReversePoints() ) ); return action; } FadeIn* FadeIn::New( const Time& duration, const Ease::Interpolation& type, - const bool& alphaChilds ) { - return eeNew( FadeIn, ( duration, type, alphaChilds ) ); + const bool& alphaChildren ) { + return eeNew( FadeIn, ( duration, type, alphaChildren ) ); } Action* FadeIn::clone() const { FadeIn* action = eeNew( FadeIn, () ); - action->mAffectChilds = mAffectChilds; + action->mAffectChildren = mAffectChildren; action->mDuration = mDuration; action->mType = mType; action->setInterpolation( mInterpolation ); @@ -67,7 +67,7 @@ Action* FadeIn::clone() const { Action* FadeIn::reverse() const { FadeIn* action = eeNew( FadeIn, () ); - action->mAffectChilds = mAffectChilds; + action->mAffectChildren = mAffectChildren; action->mDuration = mDuration; action->mType = mType; action->setInterpolation( Interpolation1d( mInterpolation.getReversePoints() ) ); @@ -82,19 +82,19 @@ void FadeIn::start() { FadeIn::FadeIn() : Fade() {} -FadeIn::FadeIn( const Time& duration, const Ease::Interpolation& type, const bool& alphaChilds ) : +FadeIn::FadeIn( const Time& duration, const Ease::Interpolation& type, const bool& alphaChildren ) : Fade(), mDuration( duration ), mType( type ) { - mAffectChilds = alphaChilds; + mAffectChildren = alphaChildren; } FadeOut* FadeOut::New( const Time& duration, const Ease::Interpolation& type, - const bool& alphaChilds ) { - return eeNew( FadeOut, ( duration, type, alphaChilds ) ); + const bool& alphaChildren ) { + return eeNew( FadeOut, ( duration, type, alphaChildren ) ); } Action* FadeOut::clone() const { FadeOut* action = eeNew( FadeOut, () ); - action->mAffectChilds = mAffectChilds; + action->mAffectChildren = mAffectChildren; action->mDuration = mDuration; action->mType = mType; action->setInterpolation( mInterpolation ); @@ -103,7 +103,7 @@ Action* FadeOut::clone() const { Action* FadeOut::reverse() const { FadeOut* action = eeNew( FadeOut, () ); - action->mAffectChilds = mAffectChilds; + action->mAffectChildren = mAffectChildren; action->mDuration = mDuration; action->mType = mType; action->setInterpolation( Interpolation1d( mInterpolation.getReversePoints() ) ); @@ -118,9 +118,10 @@ void FadeOut::start() { FadeOut::FadeOut() : Fade() {} -FadeOut::FadeOut( const Time& duration, const Ease::Interpolation& type, const bool& alphaChilds ) : +FadeOut::FadeOut( const Time& duration, const Ease::Interpolation& type, + const bool& alphaChildren ) : Fade(), mDuration( duration ), mType( type ) { - mAffectChilds = alphaChilds; + mAffectChildren = alphaChildren; } }}} // namespace EE::Scene::Actions diff --git a/src/eepp/scene/node.cpp b/src/eepp/scene/node.cpp index 1471fc9c1..855136f80 100644 --- a/src/eepp/scene/node.cpp +++ b/src/eepp/scene/node.cpp @@ -181,7 +181,7 @@ Node* Node::setVisible( const bool& visible, bool emitEventNotification ) { return this; } -Node* Node::setChildsVisibility( bool visible, bool emitEventNotification ) { +Node* Node::setChildrenVisibility( bool visible, bool emitEventNotification ) { Node* child = mChild; if ( emitEventNotification ) { while ( child ) { @@ -740,7 +740,7 @@ void Node::childRemove( Node* node ) { onChildCountChange( node, true ); } -void Node::childsCloseAll() { +void Node::closeAllChildren() { Node* childLoop = mChild; writeNodeFlag( NODE_FLAG_CLOSING_CHILDREN, 1 ); while ( NULL != childLoop ) { @@ -1369,10 +1369,10 @@ void Node::setDirty() { mNodeFlags |= NODE_FLAG_POSITION_DIRTY | NODE_FLAG_POLYGON_DIRTY; - setChildsDirty(); + setChildrenDirty(); } -void Node::setChildsDirty() { +void Node::setChildrenDirty() { Node* ChildLoop = mChild; while ( NULL != ChildLoop ) { @@ -1534,11 +1534,11 @@ void Node::setAlpha( const Float& alpha ) { } } -void Node::setChildsAlpha( const Float& alpha ) { +void Node::setChildrenAlpha( const Float& alpha ) { Node* child = mChild; while ( NULL != child ) { child->setAlpha( alpha ); - child->setChildsAlpha( alpha ); + child->setChildrenAlpha( alpha ); child = child->getNextNode(); } } @@ -1726,7 +1726,7 @@ Node* Node::getParentWidget() const { } void Node::sendParentSizeChange( const Vector2f& sizeChange ) { - if ( reportSizeChangeToChilds() ) { + if ( reportSizeChangeToChildren() ) { Node* child = mChild; while ( NULL != child ) { @@ -1736,16 +1736,16 @@ void Node::sendParentSizeChange( const Vector2f& sizeChange ) { } } -bool Node::reportSizeChangeToChilds() const { - return 0 != ( mNodeFlags & NODE_FLAG_REPORT_SIZE_CHANGE_TO_CHILDS ); +bool Node::reportSizeChangeToChildren() const { + return 0 != ( mNodeFlags & NODE_FLAG_REPORT_SIZE_CHANGE_TO_CHILDREN ); } void Node::enableReportSizeChangeToChildren() { - writeNodeFlag( NODE_FLAG_REPORT_SIZE_CHANGE_TO_CHILDS, 1 ); + writeNodeFlag( NODE_FLAG_REPORT_SIZE_CHANGE_TO_CHILDREN, 1 ); } -void Node::disableReportSizeChangeToChilds() { - writeNodeFlag( NODE_FLAG_REPORT_SIZE_CHANGE_TO_CHILDS, 0 ); +void Node::disableReportSizeChangeToChildren() { + writeNodeFlag( NODE_FLAG_REPORT_SIZE_CHANGE_TO_CHILDREN, 0 ); } Node* Node::centerHorizontal() { diff --git a/src/eepp/scene/scenenode.cpp b/src/eepp/scene/scenenode.cpp index a716b5ff8..f18199b76 100644 --- a/src/eepp/scene/scenenode.cpp +++ b/src/eepp/scene/scenenode.cpp @@ -23,7 +23,7 @@ SceneNode::SceneNode( EE::Window::Window* window ) : mFrameBufferBound( false ), mUseInvalidation( false ), mUseGlobalCursors( true ), - mUpdateAllChilds( true ), + mUpdateAllChildren( true ), mResizeCb( -1 ), mDrawDebugData( false ), mDrawBoxes( false ), @@ -157,7 +157,7 @@ void SceneNode::update( const Time& time ) { node->scheduledUpdate( time ); } - if ( mUpdateAllChilds ) { + if ( mUpdateAllChildren ) { Node::update( time ); } else { for ( auto& nodeOver : mMouseOverNodes ) @@ -493,12 +493,12 @@ void SceneNode::removeMouseOverNode( Node* node ) { mMouseOverNodes.erase( node ); } -const bool& SceneNode::getUpdateAllChilds() const { - return mUpdateAllChilds; +const bool& SceneNode::getUpdateAllChildren() const { + return mUpdateAllChildren; } -void SceneNode::setUpdateAllChilds( const bool& updateAllChilds ) { - mUpdateAllChilds = updateAllChilds; +void SceneNode::setUpdateAllChildren( bool updateAllChildren ) { + mUpdateAllChildren = updateAllChildren; } const Float& SceneNode::getDPI() const { diff --git a/src/eepp/system/compression.cpp b/src/eepp/system/compression.cpp index 7010a2db9..652b6b530 100644 --- a/src/eepp/system/compression.cpp +++ b/src/eepp/system/compression.cpp @@ -83,9 +83,9 @@ int Compression::getMaxCompressedBufferSize( Uint64 srcSize, Mode mode, const Co Z_DEFAULT_STRATEGY ); if ( err != Z_OK ) return -1; - int aout = deflateBound( &strm, srcSize ); + int out = deflateBound( &strm, srcSize ); deflateEnd( &strm ); - return aout; + return out; } } diff --git a/src/eepp/system/inifile.cpp b/src/eepp/system/inifile.cpp index 14b68e4bf..7bbfd8b5a 100644 --- a/src/eepp/system/inifile.cpp +++ b/src/eepp/system/inifile.cpp @@ -86,7 +86,7 @@ bool IniFile::loadFromFile( const std::string& iniPath ) { bool IniFile::readFile() { - if ( mIniReaded ) + if ( mIniRead ) return true; bool isBOM = false; @@ -124,7 +124,7 @@ bool IniFile::readFile() { if ( line.length() && line[line.length() - 1] == '\r' ) line = line.substr( 0, line.size() - 1 ); - // Check that the user hasn't openned a binary file by checking the first + // Check that the user hasn't opened a binary file by checking the first // character of each line! if ( !line.empty() && line[0] != '\0' && !isprint( line[0] ) && !isspace( line[0] ) ) { Log::error( "IniFile::readFile(): Failing on char %d.", line[0] ); @@ -143,7 +143,7 @@ bool IniFile::readFile() { case '=': valuename = String::trim( line.substr( 0, pLeft ), "\t " ); // Remove the extra space between valuename - // and = . No spaced valuename permited. + // and = . No spaced valuename permitted. value = String::lTrim( line.substr( pLeft + 1 ), "\t " ); setValue( keyname, valuename, value ); break; @@ -159,7 +159,7 @@ bool IniFile::readFile() { } if ( mNames.size() ) { - mIniReaded = true; + mIniRead = true; return true; } @@ -443,7 +443,7 @@ bool IniFile::deleteValue( const std::string& keyname, const std::string& valuen if ( valueID == noID ) return false; - // This looks strange, but is neccessary. + // This looks strange, but is necessary. std::vector::iterator npos = mKeys[keyID].names.begin() + valueID; std::vector::iterator vpos = mKeys[keyID].values.begin() + valueID; mKeys[keyID].names.erase( npos, npos + 1 ); @@ -466,7 +466,7 @@ bool IniFile::deleteKey( const std::string& keyname ) { } void IniFile::clear() { - mIniReaded = false; + mIniRead = false; mNames.clear(); mKeys.clear(); mComments.clear(); diff --git a/src/eepp/system/iostreamdeflate.cpp b/src/eepp/system/iostreamdeflate.cpp index 63a1fff04..6e53c9dfc 100644 --- a/src/eepp/system/iostreamdeflate.cpp +++ b/src/eepp/system/iostreamdeflate.cpp @@ -7,7 +7,7 @@ namespace EE { namespace System { struct LocalStreamData { z_stream strm; int state; - bool writedStream; + bool writtenStream; }; IOStreamDeflate* IOStreamDeflate::New( IOStream& inOutStream, Compression::Mode mode, @@ -25,14 +25,14 @@ IOStreamDeflate::IOStreamDeflate( IOStream& inOutStream, Compression::Mode mode, int level = mode == Compression::MODE_DEFLATE ? config.zlib.level : config.gzip.level; mLocalStream->strm = z_stream{}; - mLocalStream->writedStream = false; + mLocalStream->writtenStream = false; mLocalStream->state = deflateInit2( &mLocalStream->strm, level, Z_DEFLATED, windowBits, 8, Z_DEFAULT_STRATEGY ); } IOStreamDeflate::~IOStreamDeflate() { - if ( mStream.isOpen() && mLocalStream->writedStream ) { + if ( mStream.isOpen() && mLocalStream->writtenStream ) { z_stream& zstr = mLocalStream->strm; if ( zstr.next_out ) { @@ -132,7 +132,7 @@ ios_size IOStreamDeflate::read( char* buffer, ios_size length ) { } ios_size IOStreamDeflate::write( const char* buffer, ios_size length ) { - mLocalStream->writedStream = true; + mLocalStream->writtenStream = true; if ( mLocalStream->state != Z_OK || !mStream.isOpen() || length == 0 ) return 0; diff --git a/src/eepp/system/log.cpp b/src/eepp/system/log.cpp index 1e8b6b20e..7e08fb8af 100644 --- a/src/eepp/system/log.cpp +++ b/src/eepp/system/log.cpp @@ -87,7 +87,7 @@ void Log::setFilePath( const std::string& filePath ) { } Log::~Log() { - writel( LogLevel::Info, "eepp stoped\n" ); + writel( LogLevel::Info, "eepp stopped\n" ); if ( mSave && !mLiveWrite && mKeepLog ) { openFS(); diff --git a/src/eepp/system/pak.cpp b/src/eepp/system/pak.cpp index 9e1652a4e..659c4c811 100644 --- a/src/eepp/system/pak.cpp +++ b/src/eepp/system/pak.cpp @@ -61,9 +61,9 @@ bool Pak::open( const std::string& path ) { if ( checkPack() == 0 ) { mPak.pakFilesNum = mPak.header.dir_length / 64; // Number of files in the PAK - mPak.fs->seek( mPak.header.dir_offset ); // Seek to read the pakEntrys + mPak.fs->seek( mPak.header.dir_offset ); // Seek to read the pakEntries - for ( Uint32 i = 0; i < mPak.pakFilesNum; i++ ) { // Read all the pakEntrys + for ( Uint32 i = 0; i < mPak.pakFilesNum; i++ ) { // Read all the pakEntries pakEntry Entry; mPak.fs->read( reinterpret_cast( &Entry ), sizeof( pakEntry ) ); @@ -238,11 +238,11 @@ bool Pak::addFile( const Uint8* data, const Uint32& dataSize, const std::string& std::vector pakE; pakE.resize( mPak.pakFilesNum + - 1 ); // Alloc space for all the pakEntrys and the new one + 1 ); // Alloc space for all the pakEntries and the new one - mPak.fs->seek( mPak.header.dir_offset ); // seek to the file pakEntrys + mPak.fs->seek( mPak.header.dir_offset ); // seek to the file pakEntries mPak.fs->read( reinterpret_cast( &pakE[0] ), - sizeof( pakEntry ) * mPak.pakFilesNum ); // get all the pakEntrys + sizeof( pakEntry ) * mPak.pakFilesNum ); // get all the pakEntries mPak.header.dir_offset = mPak.header.dir_offset + fsize; // Update the new dir_offset mPak.header.dir_length = @@ -263,7 +263,7 @@ bool Pak::addFile( const Uint8* data, const Uint32& dataSize, const std::string& pakE[mPak.pakFilesNum].file_position = mPak.header.dir_offset - fsize; pakE[mPak.pakFilesNum].file_length = fsize; - // Update the new pakEntrys on pakFile + // Update the new pakEntries on pakFile mPak.fs->write( reinterpret_cast( &pakE[0] ), (ios_size)( sizeof( pakEntry ) * pakE.size() ) ); diff --git a/src/eepp/system/platform/posix/threadimpl.cpp b/src/eepp/system/platform/posix/threadimpl.cpp index 7ccfadff6..dad6bb87b 100644 --- a/src/eepp/system/platform/posix/threadimpl.cpp +++ b/src/eepp/system/platform/posix/threadimpl.cpp @@ -49,7 +49,7 @@ void* ThreadImpl::entryPoint( void* userData ) { // The Thread instance is stored in the user data Thread* owner = static_cast( userData ); -// Tell the thread to handle cancel requests immediatly +// Tell the thread to handle cancel requests immediately #ifdef PTHREAD_CANCEL_ASYNCHRONOUS pthread_setcanceltype( PTHREAD_CANCEL_ASYNCHRONOUS, NULL ); #endif diff --git a/src/eepp/system/sys.cpp b/src/eepp/system/sys.cpp index 053916710..98b62141b 100644 --- a/src/eepp/system/sys.cpp +++ b/src/eepp/system/sys.cpp @@ -1113,9 +1113,9 @@ std::string Sys::which( const std::string& exeName, FileSystem::fileExists( exeName ) ) return exeName; - std::vector PATHS = getEnvSplitted( "PATH" ); + std::vector PATHS = getEnvSplit( "PATH" ); #if EE_PLATFORM == EE_PLATFORM_WIN - static std::vector PATHEXTS = getEnvSplitted( "PATHEXT" ); + static std::vector PATHEXTS = getEnvSplit( "PATHEXT" ); std::string exePath; #endif @@ -1173,7 +1173,7 @@ std::string Sys::getEnv( const std::string& name ) { #endif } -std::vector Sys::getEnvSplitted( const std::string& name ) { +std::vector Sys::getEnvSplit( const std::string& name ) { return String::split( getEnv( name.c_str() ), PATH_SEP_CHAR ); } @@ -1429,7 +1429,7 @@ Int64 Sys::getProcessCreationTime( Uint64 pid ) { std::vector Sys::pidof( const std::string& processName ) { #if EE_PLATFORM == EE_PLATFORM_WIN std::vector pids; - std::vector extensions = getEnvSplitted( "PATHEXT" ); + std::vector extensions = getEnvSplit( "PATHEXT" ); HMODULE hPsapi = LoadLibrary( TEXT( "psapi.dll" ) ); if ( !hPsapi ) @@ -1603,7 +1603,7 @@ std::vector Sys::pidof( const std::string& processName ) { std::vector> Sys::listProcesses() { #if EE_PLATFORM == EE_PLATFORM_WIN std::vector> pids; - std::vector extensions = getEnvSplitted( "PATHEXT" ); + std::vector extensions = getEnvSplit( "PATHEXT" ); HMODULE hPsapi = LoadLibrary( TEXT( "psapi.dll" ) ); if ( !hPsapi ) diff --git a/src/eepp/ui/css/stylesheetselector.cpp b/src/eepp/ui/css/stylesheetselector.cpp index 7a876a490..8319563c5 100644 --- a/src/eepp/ui/css/stylesheetselector.cpp +++ b/src/eepp/ui/css/stylesheetselector.cpp @@ -49,7 +49,7 @@ void StyleSheetSelector::parseSelector( std::string selector ) { // Remove spaces that means nothing to the selector logic // for example: // Element > .class #id - // shold be + // should be // Element>.class #id removeExtraSpaces( selector ); diff --git a/src/eepp/ui/doc/documentview.cpp b/src/eepp/ui/doc/documentview.cpp index 5c0833717..41d5e4f1f 100644 --- a/src/eepp/ui/doc/documentview.cpp +++ b/src/eepp/ui/doc/documentview.cpp @@ -562,7 +562,7 @@ void DocumentView::recomputeDocLineToVisibleIndex( Int64 fromVisibleIndex, bool for ( Int64 visibleIdx = fromVisibleIndex; visibleIdx < visibleLinesCount; visibleIdx++ ) { const auto& visibleLine = mVisibleLines[visibleIdx]; if ( visibleLine.column() == 0 ) { - // Non-contiguos lines means hidden lines + // Non-contiguous lines means hidden lines if ( visibleLine.line() - previousLineIdx > 1 ) { for ( Int64 i = previousLineIdx + 1; i < visibleLine.line(); i++ ) mDocLineToVisibleIndex[i] = static_cast( VisibleIndex::invalid ); diff --git a/src/eepp/ui/doc/syntaxtokenizer.cpp b/src/eepp/ui/doc/syntaxtokenizer.cpp index c745880ad..034e0740a 100644 --- a/src/eepp/ui/doc/syntaxtokenizer.cpp +++ b/src/eepp/ui/doc/syntaxtokenizer.cpp @@ -57,11 +57,11 @@ static void pushToken( std::vector& tokens, const SyntaxStyleType& type, if ( text.empty() ) return; if ( !tokens.empty() && ( tokens[tokens.size() - 1].type == type ) ) { - size_t tpos = tokens.size() - 1; - tokens[tpos].type = type; + size_t tokenPos = tokens.size() - 1; + tokens[tokenPos].type = type; if constexpr ( std::is_same_v ) - tokens[tpos].text += text; - tokens[tpos].len += String::utf8Length( text ); + tokens[tokenPos].text += text; + tokens[tokenPos].len += String::utf8Length( text ); } else { if ( text.size() > MAX_TOKEN_SIZE ) { size_t textSize = text.size(); @@ -79,10 +79,10 @@ static void pushToken( std::vector& tokens, const SyntaxStyleType& type, if constexpr ( std::is_same_v ) { tokens.push_back( { type, std::string{ substr }, len } ); } else if constexpr ( std::is_same_v ) { - SyntaxStyleType tpos = tokens.empty() ? 0 - : tokens[tokens.size() - 1].pos + - tokens[tokens.size() - 1].len; - tokens.push_back( { type, tpos, len } ); + SyntaxStyleType tokenPos = tokens.empty() ? 0 + : tokens[tokens.size() - 1].pos + + tokens[tokens.size() - 1].len; + tokens.push_back( { type, tokenPos, len } ); } else { tokens.push_back( { type, len } ); } @@ -94,11 +94,11 @@ static void pushToken( std::vector& tokens, const SyntaxStyleType& type, tokens.push_back( { type, std::string{ text }, static_cast( String::utf8Length( text ) ) } ); } else if constexpr ( std::is_same_v ) { - SyntaxStyleType tpos = + SyntaxStyleType tokenPos = tokens.empty() ? 0 : tokens[tokens.size() - 1].pos + tokens[tokens.size() - 1].len; tokens.push_back( - { type, tpos, static_cast( String::utf8Length( text ) ) } ); + { type, tokenPos, static_cast( String::utf8Length( text ) ) } ); } else { tokens.push_back( { type, static_cast( String::utf8Length( text ) ) } ); diff --git a/src/eepp/ui/doc/textdocument.cpp b/src/eepp/ui/doc/textdocument.cpp index 638c1f060..ca51c3ebf 100644 --- a/src/eepp/ui/doc/textdocument.cpp +++ b/src/eepp/ui/doc/textdocument.cpp @@ -104,11 +104,11 @@ bool TextDocument::fileMightBeBinary( const std::string& file ) { return false; // Likely a text file } -bool TextDocument::isTextDocummentCommand( std::string_view cmd ) { +bool TextDocument::isTextDocumentCommand( std::string_view cmd ) { return TEXT_DOCUMENT_COMMANDS.contains( String::hash( cmd ) ); } -bool TextDocument::isTextDocummentCommand( String::HashType cmdHash ) { +bool TextDocument::isTextDocumentCommand( String::HashType cmdHash ) { return TEXT_DOCUMENT_COMMANDS.contains( cmdHash ); } @@ -474,7 +474,7 @@ void TextDocument::guessIndentType() { if ( !match.empty() ) { guessTabs++; guessCountdown--; - break; // if tab found asume tabs + break; // if tab found assume tabs } } if ( guessCountdown == 0 ) @@ -1038,7 +1038,7 @@ void TextDocument::setSelection( const size_t& cursorIdx, TextPosition start, Te notifySelectionChanged( mSelection[cursorIdx] ); if ( !mDoingTextInput && mLastCursorChangeWasInteresting ) { - notifyInterstingCursorChange( mSelection[cursorIdx].start() ); + notifyInterestingCursorChange( mSelection[cursorIdx].start() ); mLastCursorChangeWasInteresting = false; } } @@ -1304,7 +1304,7 @@ TextPosition TextDocument::insert( const size_t& cursorIdx, TextPosition positio if ( linesAdd > 0 ) { mHighlighter->moveHighlight( position.line(), position.line(), linesAdd ); - notifiyDocumenLineMove( position.line(), position.line(), linesAdd ); + notifyDocumentLineMove( position.line(), position.line(), linesAdd ); } notifyTextChanged( { { position, position }, text } ); @@ -1504,7 +1504,7 @@ size_t TextDocument::remove( const size_t& cursorIdx, TextRange range, mHighlighter->moveHighlight( deletedAcrossNewLine ? range.start().line() : range.end().line(), range.end().line(), -linesRemoved ); - notifiyDocumenLineMove( originalRange.start().line(), originalRange.end().line(), + notifyDocumentLineMove( originalRange.start().line(), originalRange.end().line(), -linesRemoved ); } @@ -1568,7 +1568,7 @@ TextPosition TextDocument::previousWordBoundary( TextPosition position, bool ign if ( !ignoreFirstNonWord && !inWord ) return position; String::StringBaseType nextChar = 0; - Int64 seekedChars = static_cast( maxSeekChars ); + Int64 seekChars = static_cast( maxSeekChars ); do { TextPosition curPos = position; position = positionOffset( position, -1 ); @@ -1577,8 +1577,8 @@ TextPosition TextDocument::previousWordBoundary( TextPosition position, bool ign } nextChar = getChar( positionOffset( position, -1 ) ); } while ( ( ( inWord && !isNonWord( nextChar ) ) || ( !inWord && nextChar == ch ) ) && - --seekedChars ); - return returnInvalidOnMaxSeek && seekedChars == 0 ? TextPosition() : position; + --seekChars ); + return returnInvalidOnMaxSeek && seekChars == 0 ? TextPosition() : position; } TextPosition TextDocument::nextWordBoundary( TextPosition position, bool ignoreFirstNonWord, @@ -1589,7 +1589,7 @@ TextPosition TextDocument::nextWordBoundary( TextPosition position, bool ignoreF if ( !ignoreFirstNonWord && !inWord ) return position; String::StringBaseType nextChar = 0; - Int64 seekedChars = static_cast( maxSeekChars ); + Int64 seekChars = static_cast( maxSeekChars ); do { TextPosition curPos = position; position = positionOffset( position, 1 ); @@ -1598,8 +1598,8 @@ TextPosition TextDocument::nextWordBoundary( TextPosition position, bool ignoreF } nextChar = getChar( position ); } while ( ( ( inWord && !isNonWord( nextChar ) ) || ( !inWord && nextChar == ch ) ) && - --seekedChars ); - return returnInvalidOnMaxSeek && seekedChars == 0 ? TextPosition() : position; + --seekChars ); + return returnInvalidOnMaxSeek && seekChars == 0 ? TextPosition() : position; } TextPosition TextDocument::previousSpaceBoundaryInLine( TextPosition position, @@ -1608,7 +1608,7 @@ TextPosition TextDocument::previousSpaceBoundaryInLine( TextPosition position, auto ch = getChar( positionOffset( position, -1 ) ); bool inWord = ch != ' '; String::StringBaseType nextChar = 0; - Int64 seekedChars = static_cast( maxSeekChars ); + Int64 seekChars = static_cast( maxSeekChars ); do { TextPosition curPos = position; position = positionOffset( position, -1 ); @@ -1619,8 +1619,8 @@ TextPosition TextDocument::previousSpaceBoundaryInLine( TextPosition position, break; } nextChar = getChar( positionOffset( position, -1 ) ); - } while ( ( ( inWord && nextChar != ' ' ) || ( !inWord && nextChar == ch ) ) && --seekedChars ); - return returnInvalidOnMaxSeek && seekedChars == 0 ? TextPosition() : position; + } while ( ( ( inWord && nextChar != ' ' ) || ( !inWord && nextChar == ch ) ) && --seekChars ); + return returnInvalidOnMaxSeek && seekChars == 0 ? TextPosition() : position; } TextPosition TextDocument::nextSpaceBoundaryInLine( TextPosition position, std::size_t maxSeekChars, @@ -1628,7 +1628,7 @@ TextPosition TextDocument::nextSpaceBoundaryInLine( TextPosition position, std:: auto ch = getChar( position ); bool inWord = ch != ' '; String::StringBaseType nextChar = 0; - Int64 seekedChars = static_cast( maxSeekChars ); + Int64 seekChars = static_cast( maxSeekChars ); do { TextPosition curPos = position; position = positionOffset( position, 1 ); @@ -1639,8 +1639,8 @@ TextPosition TextDocument::nextSpaceBoundaryInLine( TextPosition position, std:: break; } nextChar = getChar( position ); - } while ( ( ( inWord && nextChar != ' ' ) || ( !inWord && nextChar == ch ) ) && --seekedChars ); - return returnInvalidOnMaxSeek && seekedChars == 0 ? TextPosition() : position; + } while ( ( ( inWord && nextChar != ' ' ) || ( !inWord && nextChar == ch ) ) && --seekChars ); + return returnInvalidOnMaxSeek && seekChars == 0 ? TextPosition() : position; } TextPosition TextDocument::startOfWord( TextPosition position ) const { @@ -3782,7 +3782,7 @@ void TextDocument::notifyCursorChanged( TextPosition selection ) { } } -void TextDocument::notifyInterstingCursorChange( TextPosition selection ) { +void TextDocument::notifyInterestingCursorChange( TextPosition selection ) { if ( !selection.isValid() ) selection = getSelection().start(); Lock l( mClientsMutex ); @@ -3884,7 +3884,7 @@ void TextDocument::notifySyntaxDefinitionChange() { } } -void TextDocument::notifiyDocumenLineMove( const Int64& fromLine, const Int64& toLine, +void TextDocument::notifyDocumentLineMove( const Int64& fromLine, const Int64& toLine, const Int64& numLines ) { Lock l( mClientsMutex ); for ( auto& client : mClients ) { diff --git a/src/eepp/ui/models/filesystemmodel.cpp b/src/eepp/ui/models/filesystemmodel.cpp index cb489de24..39f8cdf95 100644 --- a/src/eepp/ui/models/filesystemmodel.cpp +++ b/src/eepp/ui/models/filesystemmodel.cpp @@ -139,11 +139,11 @@ void FileSystemModel::Node::rename( const FileInfo& file ) { mHash = String::hash( mName ); mDisplayName = mName; updateMimeType(); - updateChilds( oldParentFile, mInfo ); + updateChildren( oldParentFile, mInfo ); } -void FileSystemModel::Node::updateChilds( const FileInfo& oldParentFile, - const FileInfo& newParentFile ) { +void FileSystemModel::Node::updateChildren( const FileInfo& oldParentFile, + const FileInfo& newParentFile ) { for ( Node* child : mChildren ) { if ( String::startsWith( child->mInfo.getFilepath(), oldParentFile.getFilepath() ) ) { std::string newFilePath( child->mInfo.getFilepath() ); @@ -200,7 +200,7 @@ bool FileSystemModel::Node::refresh( const FileSystemModel& model ) { auto files = FileSystem::filesInfoGetInPath( mInfo.getFilepath(), false, displayCfg.sortByName, displayCfg.foldersFirst, displayCfg.ignoreHidden, - [&model] { return model.mShutingDown.load( std::memory_order_relaxed ); } ); + [&model] { return model.mShuttingDown.load( std::memory_order_relaxed ); } ); std::vector newChildren; Node* node = nullptr; @@ -261,7 +261,7 @@ bool FileSystemModel::Node::traverseIfNeeded( const FileSystemModel& model ) { auto files = FileSystem::filesInfoGetInPath( mInfo.getFilepath(), false, displayCfg.sortByName, displayCfg.foldersFirst, displayCfg.ignoreHidden, - [&model] { return model.mShutingDown.load( std::memory_order_relaxed ); } ); + [&model] { return model.mShuttingDown.load( std::memory_order_relaxed ); } ); const auto& patterns = displayCfg.acceptedExtensions; bool accepted; @@ -375,7 +375,7 @@ FileSystemModel::FileSystemModel( const std::string& rootPath, const FileSystemM } FileSystemModel::~FileSystemModel() { - mShutingDown = true; + mShuttingDown = true; mInitOK = false; mRoot.reset(); } diff --git a/src/eepp/ui/models/model.cpp b/src/eepp/ui/models/model.cpp index df70a8053..d7d413347 100644 --- a/src/eepp/ui/models/model.cpp +++ b/src/eepp/ui/models/model.cpp @@ -324,12 +324,12 @@ void Model::releaseResourceMutex() { mResourceLock.unlock(); } -Uint32 Model::subsribeModelStyler( const ModelStyler& styler ) { +Uint32 Model::subscribeModelStyler( const ModelStyler& styler ) { mStylers[++mLastStylerId] = styler; return mLastStylerId; } -void Model::unsubsribeModelStyler( Uint32 id ) { +void Model::unsubscribeModelStyler( Uint32 id ) { mStylers.erase( id ); } diff --git a/src/eepp/ui/tools/textureatlaseditor.cpp b/src/eepp/ui/tools/textureatlaseditor.cpp index a742ed5f0..ad89461ff 100644 --- a/src/eepp/ui/tools/textureatlaseditor.cpp +++ b/src/eepp/ui/tools/textureatlaseditor.cpp @@ -385,7 +385,7 @@ void TextureAtlasEditor::fillTextureRegionList() { 8.f / (Float)mTextureRegionList->getCount() ); if ( !res.empty() ) { - mTextureRegionGrid->childsCloseAll(); + mTextureRegionGrid->closeAllChildren(); for ( auto& it : res ) { TextureRegion* tr = it.second; @@ -468,7 +468,7 @@ void TextureAtlasEditor::onTextureAtlasClose( const Event* ) { TextureAtlasManager::instance()->remove( mTextureAtlasLoader->getTextureAtlas() ); eeSAFE_DELETE( mTextureAtlasLoader ); mTextureRegionList->clear(); - mTextureRegionGrid->childsCloseAll(); + mTextureRegionGrid->closeAllChildren(); mSpinOffX->setValue( 0 ); mSpinOffY->setValue( 0 ); mSpinDestW->setValue( 0 ); diff --git a/src/eepp/ui/tools/textureatlasnew.cpp b/src/eepp/ui/tools/textureatlasnew.cpp index b0a4f9f16..e349b9d60 100644 --- a/src/eepp/ui/tools/textureatlasnew.cpp +++ b/src/eepp/ui/tools/textureatlasnew.cpp @@ -12,11 +12,11 @@ namespace EE { namespace UI { namespace Tools { TextureAtlasNew::TextureAtlasNew( TGCreateCb NewTGCb ) : mUIWindow( NULL ), mNewTGCb( NewTGCb ) { mUIWindow = UIWindow::New(); mUIWindow->setSizeWithDecoration( 378, 0 )->setMinWindowSize( 378, 0 )->setWindowFlags( - UI_WIN_CLOSE_BUTTON | UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS | UI_WIN_SHARE_ALPHA_WITH_CHILDREN | - UI_WIN_MODAL ); + UI_WIN_CLOSE_BUTTON | UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS | + UI_WIN_SHARE_ALPHA_WITH_CHILDREN | UI_WIN_MODAL ); mUIWindow->addEventListener( Event::OnWindowClose, - [this] ( auto event ) { windowClose( event ); } ); + [this]( auto event ) { windowClose( event ); } ); mUIWindow->setTitle( "New Texture Atlas" ); static const auto layout = R"xml( @@ -68,7 +68,7 @@ TextureAtlasNew::TextureAtlasNew( TGCreateCb NewTGCb ) : mUIWindow( NULL ), mNew - @@ -91,7 +91,7 @@ TextureAtlasNew::TextureAtlasNew( TGCreateCb NewTGCb ) : mUIWindow( NULL ), mNew mUIWindow->bind( "forcePow2", mForcePow2 ); mUIWindow->bind( "scalableSVG", mScalableSVG ); mUIWindow->bind( "saveExtensions", mSaveExtensions ); - mUIWindow->bind( "allowChilds", mAllowChilds ); + mUIWindow->bind( "allowChildren", mAllowChildren ); std::vector Sizes; @@ -105,11 +105,11 @@ TextureAtlasNew::TextureAtlasNew( TGCreateCb NewTGCb ) : mUIWindow( NULL ), mNew mComboHeight->getListBox()->setSelected( "2048" ); mSetPathButton->addEventListener( Event::MouseClick, - [this] ( auto event ) { onDialogFolderSelect( event ); } ); + [this]( auto event ) { onDialogFolderSelect( event ); } ); mUIWindow->find( "okButton" ) - ->addEventListener( Event::MouseClick, [this] ( auto event ) { okClick( event ); } ); + ->addEventListener( Event::MouseClick, [this]( auto event ) { okClick( event ); } ); mUIWindow->find( "cancelButton" ) - ->addEventListener( Event::MouseClick, [this] ( auto event ) { cancelClick( event ); } ); + ->addEventListener( Event::MouseClick, [this]( auto event ) { cancelClick( event ); } ); container->addEventListener( Event::OnLayoutUpdate, [this]( const Event* event ) { mUIWindow->setMinWindowSize( event->getNode()->getSize() ); @@ -133,7 +133,7 @@ void TextureAtlasNew::okClick( const Event* event ) { TGDialog->setWindowFlags( UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL ); TGDialog->setTitle( "Save Texture Atlas" ); TGDialog->addEventListener( Event::SaveFile, - [this] ( auto event ) { textureAtlasSave( event ); } ); + [this]( auto event ) { textureAtlasSave( event ); } ); TGDialog->center(); TGDialog->show(); } @@ -172,7 +172,7 @@ void TextureAtlasNew::textureAtlasSave( const Event* Event ) { TexturePacker* texturePacker = TexturePacker::New( w, h, PixelDensity::toFloat( PixelDensity::fromString( mPixelDensity->getText() ) ), mForcePow2->isChecked(), mScalableSVG->isChecked(), b, textureFilter, - mAllowChilds->isChecked(), false ); + mAllowChildren->isChecked(), false ); texturePacker->addTexturesPath( mTGPath->getText() ); @@ -212,7 +212,7 @@ void TextureAtlasNew::onDialogFolderSelect( const Event* event ) { TGDialog->setWindowFlags( UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL ); TGDialog->setTitle( "Create Texture Atlas ( Select Folder Containing Textures )" ); TGDialog->addEventListener( Event::OpenFile, - [this] ( auto event ) { onSelectFolder( event ); } ); + [this]( auto event ) { onSelectFolder( event ); } ); TGDialog->center(); TGDialog->show(); } diff --git a/src/eepp/ui/tools/textureatlasnew.hpp b/src/eepp/ui/tools/textureatlasnew.hpp index 4b4d2cef2..a88302d06 100644 --- a/src/eepp/ui/tools/textureatlasnew.hpp +++ b/src/eepp/ui/tools/textureatlasnew.hpp @@ -33,7 +33,7 @@ class EE_API TextureAtlasNew { UICheckBox* mForcePow2; UICheckBox* mScalableSVG; UICheckBox* mSaveExtensions; - UICheckBox* mAllowChilds; + UICheckBox* mAllowChildren; void windowClose( const Event* Event ); diff --git a/src/eepp/ui/uicodeeditor.cpp b/src/eepp/ui/uicodeeditor.cpp index 6b23a0fbc..20902c7ad 100644 --- a/src/eepp/ui/uicodeeditor.cpp +++ b/src/eepp/ui/uicodeeditor.cpp @@ -628,13 +628,13 @@ UICodeEditor* UICodeEditor::setFont( Font* font ) { } void UICodeEditor::onFontChanged() { - udpateGlyphWidth(); + updateGlyphWidth(); mDocView.setFontStyle( mFontStyleConfig ); invalidateDraw(); } void UICodeEditor::onFontStyleChanged() { - udpateGlyphWidth(); + updateGlyphWidth(); mDocView.setFontStyle( mFontStyleConfig ); invalidateDraw(); } @@ -1088,7 +1088,7 @@ Uint32 UICodeEditor::onTextInput( const TextInputEvent& event ) { return 0; if ( mLastExecuteEventId == getUISceneNode()->getWindow()->getInput()->getEventsSentId() && - !TextDocument::isTextDocummentCommand( mLastCmdHash ) ) + !TextDocument::isTextDocumentCommand( mLastCmdHash ) ) return 0; mDoc->textInput( event.getText() ); @@ -2237,7 +2237,7 @@ void UICodeEditor::onDocumentLineMove( const Int64& fromLine, const Int64& toLin } void UICodeEditor::onDocumentDirtyOnFileSystem( TextDocument* doc ) { - DocEvent event( this, doc, Event::OnDocumentDirtyOnFileSysten ); + DocEvent event( this, doc, Event::OnDocumentDirtyOnFileSystem ); sendEvent( &event ); } @@ -3245,7 +3245,7 @@ Float UICodeEditor::getGlyphWidth() const { return mGlyphWidth; } -void UICodeEditor::udpateGlyphWidth() { +void UICodeEditor::updateGlyphWidth() { mGlyphWidth = mFont->getGlyph( '@', getCharacterSize(), false, false ).advance; mMouseWheelScroll = 3 * getLineHeight(); invalidateLongestLineWidth(); @@ -5254,8 +5254,8 @@ bool UICodeEditor::isCursorVisible() const { } void UICodeEditor::setDisableCursorBlinkingAfterAMinuteOfInactivity( - bool diableCursorBlinkingAfterAMinuteOfInactivity ) { - mDisableCursorBlinkingAfterAMinuteOfInactivity = diableCursorBlinkingAfterAMinuteOfInactivity; + bool disableCursorBlinkingAfterAMinuteOfInactivity ) { + mDisableCursorBlinkingAfterAMinuteOfInactivity = disableCursorBlinkingAfterAMinuteOfInactivity; } bool UICodeEditor::isCursorBlinkingAfterAMinuteOfInactivityDisabled() const { diff --git a/src/eepp/ui/uiconsole.cpp b/src/eepp/ui/uiconsole.cpp index 583e0423b..779b04038 100644 --- a/src/eepp/ui/uiconsole.cpp +++ b/src/eepp/ui/uiconsole.cpp @@ -937,7 +937,7 @@ Uint32 UIConsole::onTextInput( const TextInputEvent& event ) { return 0; if ( mLastExecuteEventId == getUISceneNode()->getWindow()->getInput()->getEventsSentId() && - !TextDocument::isTextDocummentCommand( mLastCmdHash ) ) + !TextDocument::isTextDocumentCommand( mLastCmdHash ) ) return 0; const String& text = event.getText(); diff --git a/src/eepp/ui/uilinearlayout.cpp b/src/eepp/ui/uilinearlayout.cpp index 7eb6cc317..79f49e743 100644 --- a/src/eepp/ui/uilinearlayout.cpp +++ b/src/eepp/ui/uilinearlayout.cpp @@ -67,7 +67,7 @@ void UILinearLayout::updateLayout() { mDirtyLayout = false; } -void UILinearLayout::applyWidthPolicyOnChilds() { +void UILinearLayout::applyWidthPolicyOnChildren() { Node* child = mChild; while ( NULL != child ) { @@ -116,7 +116,7 @@ void UILinearLayout::applyWidthPolicyOnChilds() { } } -void UILinearLayout::applyHeightPolicyOnChilds() { +void UILinearLayout::applyHeightPolicyOnChildren() { Node* child = mChild; while ( NULL != child ) { @@ -192,7 +192,7 @@ void UILinearLayout::packVertical() { if ( sizeChanged ) setInternalPixelsSize( size ); - applyWidthPolicyOnChilds(); + applyWidthPolicyOnChildren(); Float curY = mPaddingPx.Top; Float maxX = 0; @@ -323,7 +323,7 @@ void UILinearLayout::packHorizontal() { if ( sizeChanged ) setInternalPixelsSize( size ); - applyHeightPolicyOnChilds(); + applyHeightPolicyOnChildren(); Float curX = mPaddingPx.Left; Float maxY = 0; diff --git a/src/eepp/ui/uilistbox.cpp b/src/eepp/ui/uilistbox.cpp index 1f6c4cd0f..2de0aa031 100644 --- a/src/eepp/ui/uilistbox.cpp +++ b/src/eepp/ui/uilistbox.cpp @@ -346,7 +346,7 @@ void UIListBox::onTouchDragValueChange( Vector2f diff ) { mHScrollBar->setValue( mHScrollBar->getValue() + ( -diff.x / mMaxTextWidth ) ); } -bool UIListBox::isTouchOverAllowedChilds() { +bool UIListBox::isTouchOverAllowedChildren() { return isMouseOverMeOrChildren() && !mVScrollBar->isMouseOverMeOrChildren() && !mHScrollBar->isMouseOverMeOrChildren(); } diff --git a/src/eepp/ui/uinode.cpp b/src/eepp/ui/uinode.cpp index f78957b7b..6e9dfb70b 100644 --- a/src/eepp/ui/uinode.cpp +++ b/src/eepp/ui/uinode.cpp @@ -192,7 +192,7 @@ Node* UINode::setSize( const Sizef& size ) { setInternalSize( s ); - if ( reportSizeChangeToChilds() ) { + if ( reportSizeChangeToChildren() ) { sendParentSizeChange( sizeChange ); } } @@ -219,7 +219,7 @@ UINode* UINode::setPixelsSize( const Sizef& size ) { setInternalPixelsSize( s ); - if ( reportSizeChangeToChilds() ) { + if ( reportSizeChangeToChildren() ) { sendParentSizeChange( PixelDensity::pxToDp( sizeChange ) ); } } @@ -1313,15 +1313,15 @@ void UINode::popState( const Uint32& State, bool emitEvent ) { } } -void UINode::setThemeToChilds( UITheme* Theme ) { +void UINode::setThemeToChildren( UITheme* Theme ) { Node* ChildLoop = mChild; while ( NULL != ChildLoop ) { if ( ChildLoop->isUINode() ) { UINode* node = static_cast( ChildLoop ); - node->setThemeToChilds( Theme ); - node->setTheme( Theme ); // First set the theme to childs to let the father override the - // childs forced themes + node->setThemeToChildren( Theme ); + node->setTheme( Theme ); // First set the theme to children to let the father override the + // children forced themes } ChildLoop = ChildLoop->getNextNode(); diff --git a/src/eepp/ui/uiprogressbar.cpp b/src/eepp/ui/uiprogressbar.cpp index 563103ae8..6c721f39b 100644 --- a/src/eepp/ui/uiprogressbar.cpp +++ b/src/eepp/ui/uiprogressbar.cpp @@ -116,8 +116,8 @@ void UIProgressBar::setTheme( UITheme* Theme ) { if ( mFiller->mFillerSkin ) { if ( mFlags & UI_AUTO_PADDING ) { Float meH = (Float)getSkinSize().getHeight(); - Float otH = (Float)mFiller->mFillerSkin->getSize().getHeight(); - Float res = Math::roundUp( ( meH - otH ) * 0.5f ); + Float skinH = (Float)mFiller->mFillerSkin->getSize().getHeight(); + Float res = Math::roundUp( ( meH - skinH ) * 0.5f ); mFiller->setPadding( Rectf( res, res, res, res ) ); } } diff --git a/src/eepp/ui/uiscenenode.cpp b/src/eepp/ui/uiscenenode.cpp index 2db2a6aad..8df8213be 100644 --- a/src/eepp/ui/uiscenenode.cpp +++ b/src/eepp/ui/uiscenenode.cpp @@ -42,12 +42,12 @@ UISceneNode::UISceneNode( EE::Window::Window* window ) : mUIIconThemeManager( UIIconThemeManager::New()->setFallbackThemeManager( mUIThemeManager ) ), mKeyBindings( mWindow->getInput() ) { // Reset size since the SceneNode already set it but needs to set the size from zero to emit - // the required events to its childs. + // the required events to its children. mSize = Sizef(); mDpSize = Sizef(); // Update only UI elements that requires it. - setUpdateAllChilds( false ); + setUpdateAllChildren( false ); mNodeFlags |= NODE_FLAG_UISCENENODE | NODE_FLAG_OVER_FIND_ALLOWED; @@ -69,8 +69,8 @@ UISceneNode::~UISceneNode() { } // UISceneNode can now destroy the ThreadPool shared to him. If that's the case, - // We need to ensure that the childs are destroyed before the thread pool, - // since its childs could be consuming it and need to uninitialize gracefully. + // We need to ensure that the children are destroyed before the thread pool, + // since its children could be consuming it and need to uninitialize gracefully. childDeleteAll(); } @@ -537,7 +537,7 @@ Node* UISceneNode::setSize( const Sizef& Size ) { setInternalSize( Size ); - if ( reportSizeChangeToChilds() ) { + if ( reportSizeChangeToChildren() ) { sendParentSizeChange( sizeChange ); } } @@ -559,7 +559,7 @@ UISceneNode* UISceneNode::setPixelsSize( const Sizef& size ) { setInternalPixelsSize( size ); - if ( reportSizeChangeToChilds() ) { + if ( reportSizeChangeToChildren() ) { sendParentSizeChange( PixelDensity::pxToDp( sizeChange ) ); } } @@ -607,7 +607,7 @@ void UISceneNode::update( const Time& elapsed ) { // This is required in some very edge cases where widgets are being created during the update // of any of these 3 steps. Usually during the layout update, this could trigger resizes that // provokes the creation of dynamic elements. This is the case of the UIListBox for example - // that creates childs dynamically only when they are visible. + // that creates children dynamically only when they are visible. int invalidationDepth = mMaxInvalidationDepth; while ( ( !mDirtyStyle.empty() || !mDirtyStyleState.empty() || !mDirtyLayouts.empty() ) && invalidationDepth > 0 ) { diff --git a/src/eepp/ui/uiscrollbar.cpp b/src/eepp/ui/uiscrollbar.cpp index c03a9dffa..d1b94f825 100644 --- a/src/eepp/ui/uiscrollbar.cpp +++ b/src/eepp/ui/uiscrollbar.cpp @@ -114,9 +114,9 @@ void UIScrollBar::setTheme( UITheme* Theme ) { mBtnDown->setSize( tSkin->getSize() ); } - adjustChilds(); + adjustChildren(); - mSlider->adjustChilds(); + mSlider->adjustChildren(); onThemeLoaded(); } @@ -177,19 +177,19 @@ void UIScrollBar::onAutoSize() { setInternalPixelsHeight( size.getHeight() ); } - adjustChilds(); + adjustChildren(); } } void UIScrollBar::onSizeChange() { onAutoSize(); - adjustChilds(); + adjustChildren(); UIWidget::onSizeChange(); } -void UIScrollBar::adjustChilds() { +void UIScrollBar::adjustChildren() { if ( mNodeFlags & NODE_FLAG_FREE_USE ) return; @@ -252,7 +252,7 @@ void UIScrollBar::adjustChilds() { } } - mSlider->adjustChilds(); + mSlider->adjustChildren(); mNodeFlags &= ~NODE_FLAG_FREE_USE; } @@ -353,7 +353,7 @@ void UIScrollBar::setExpandBackground( bool expandBackground ) { onAutoSize(); - adjustChilds(); + adjustChildren(); } } @@ -458,7 +458,7 @@ void UIScrollBar::setScrollBarStyle( const ScrollBarType& scrollBarType ) { onAutoSize(); - adjustChilds(); + adjustChildren(); } } @@ -482,7 +482,7 @@ UINode* UIScrollBar::setOrientation( const UIOrientation& orientation ) { applyDefaultTheme(); - adjustChilds(); + adjustChildren(); } return this; @@ -499,7 +499,7 @@ void UIScrollBar::onAlphaChange() { void UIScrollBar::onPaddingChange() { onAutoSize(); - adjustChilds(); + adjustChildren(); UIWidget::onPaddingChange(); } diff --git a/src/eepp/ui/uiscrollview.cpp b/src/eepp/ui/uiscrollview.cpp index 68efeea65..a8b21c2c1 100644 --- a/src/eepp/ui/uiscrollview.cpp +++ b/src/eepp/ui/uiscrollview.cpp @@ -279,7 +279,7 @@ void UIScrollView::onTouchDragValueChange( Vector2f diff ) { ( -diff.x / (Float)( mScrollView->getSize().getWidth() ) ) ); } -bool UIScrollView::isTouchOverAllowedChilds() { +bool UIScrollView::isTouchOverAllowedChildren() { bool ret = mViewType == Exclusive ? !mVScroll->isMouseOverMeOrChildren() && !mHScroll->isMouseOverMeOrChildren() : true; @@ -380,7 +380,7 @@ Uint32 UIScrollView::onMessage( const NodeMessage* Msg ) { switch ( Msg->getMsg() ) { case NodeMessage::MouseUp: { if ( mVScroll->isEnabled() && 0 != mScrollView->getSize().getHeight() && - isTouchOverAllowedChilds() && Msg->getSender()->isUINode() && + isTouchOverAllowedChildren() && Msg->getSender()->isUINode() && !Msg->getSender()->asType()->isScrollable() ) { if ( Msg->getFlags() & EE_BUTTON_WUMASK ) { mVScroll->setValue( mVScroll->getValue() - mVScroll->getClickStep() ); diff --git a/src/eepp/ui/uislider.cpp b/src/eepp/ui/uislider.cpp index 82ba5a5f4..bf18c1bb8 100644 --- a/src/eepp/ui/uislider.cpp +++ b/src/eepp/ui/uislider.cpp @@ -57,7 +57,7 @@ UISlider::UISlider( const std::string& tag, const UIOrientation& orientation ) : auto cb = [this]( const Event* ) { if ( !mUpdating ) - adjustChilds(); + adjustChildren(); }; mBackSlider->setParent( this ); @@ -114,7 +114,7 @@ void UISlider::setTheme( UITheme* Theme ) { mSlider->setThemeSkin( Theme, "vslider_button" ); } - adjustChilds(); + adjustChildren(); setValue( mValue ); @@ -123,11 +123,11 @@ void UISlider::setTheme( UITheme* Theme ) { void UISlider::onSizeChange() { UIWidget::onSizeChange(); - adjustChilds(); + adjustChildren(); } void UISlider::onPaddingChange() { - adjustChilds(); + adjustChildren(); UIWidget::onPaddingChange(); } @@ -147,7 +147,7 @@ Uint32 UISlider::onMouseDown( const Vector2i& position, const Uint32& flags ) { return UIWidget::onMouseDown( position, flags ); } -void UISlider::adjustChilds() { +void UISlider::adjustChildren() { mUpdating = true; UISkin* tSkin = mSlider->getSkin(); @@ -466,10 +466,11 @@ UIOrientation UISlider::getOrientation() const { return mOrientation; } -UISlider* UISlider::setOrientation( const UIOrientation& orientation, std::string childsBaseTag ) { +UISlider* UISlider::setOrientation( const UIOrientation& orientation, + std::string childrenBaseTag ) { if ( orientation != mOrientation ) { - if ( childsBaseTag.empty() ) - childsBaseTag = mTag; + if ( childrenBaseTag.empty() ) + childrenBaseTag = mTag; mOrientation = orientation; @@ -483,14 +484,14 @@ UISlider* UISlider::setOrientation( const UIOrientation& orientation, std::strin applyDefaultTheme(); if ( UIOrientation::Horizontal == mOrientation ) { - mBackSlider->setElementTag( childsBaseTag + "::hback" ); - mSlider->setElementTag( childsBaseTag + "::hbutton" ); + mBackSlider->setElementTag( childrenBaseTag + "::hback" ); + mSlider->setElementTag( childrenBaseTag + "::hbutton" ); } else { - mBackSlider->setElementTag( childsBaseTag + "::vback" ); - mSlider->setElementTag( childsBaseTag + "::hbutton" ); + mBackSlider->setElementTag( childrenBaseTag + "::vback" ); + mSlider->setElementTag( childrenBaseTag + "::hbutton" ); } - adjustChilds(); + adjustChildren(); } return this; @@ -504,7 +505,7 @@ void UISlider::setAllowHalfSliderOut( bool allowHalfSliderOut ) { if ( mAllowHalfSliderOut != allowHalfSliderOut ) { mAllowHalfSliderOut = allowHalfSliderOut; - adjustChilds(); + adjustChildren(); setValue( mValue ); } @@ -518,7 +519,7 @@ void UISlider::setExpandBackground( bool expandBackground ) { if ( mExpandBackground != expandBackground ) { mExpandBackground = expandBackground; - adjustChilds(); + adjustChildren(); setValue( mValue ); } @@ -532,7 +533,7 @@ void UISlider::setPageStep( const Float& pageStep ) { if ( pageStep != mPageStep ) { mPageStep = eemin( eemax( pageStep, mMinValue ), mMaxValue ); - adjustChilds(); + adjustChildren(); setValue( mValue ); } @@ -672,7 +673,7 @@ void UISlider::onAutoSize() { } if ( modified ) - adjustChilds(); + adjustChildren(); } } diff --git a/src/eepp/ui/uispinbox.cpp b/src/eepp/ui/uispinbox.cpp index 8d66d6996..b6d05ef61 100644 --- a/src/eepp/ui/uispinbox.cpp +++ b/src/eepp/ui/uispinbox.cpp @@ -23,7 +23,7 @@ UISpinBox::UISpinBox() : mInput->setEnabled( true ); mInput->setParent( this ); - auto cb = [this]( const Event* ) { adjustChilds(); }; + auto cb = [this]( const Event* ) { adjustChildren(); }; mPushUp = UIWidget::NewWithTag( "spinbox::btnup" ); mPushUp->setVisible( true ); @@ -82,11 +82,11 @@ void UISpinBox::setTheme( UITheme* Theme ) { mPushDown->setSize( tSkin->getSize() ); } - adjustChilds(); + adjustChildren(); onThemeLoaded(); } -void UISpinBox::adjustChilds() { +void UISpinBox::adjustChildren() { mInput->setSize( getSize().getWidth() - mPushUp->getSize().getWidth(), mInput->getSize().getHeight() ); @@ -204,13 +204,13 @@ void UISpinBox::onBufferChange( const Event* ) { void UISpinBox::onSizeChange() { UIWidget::onSizeChange(); - adjustChilds(); + adjustChildren(); } void UISpinBox::onPositionChange() { UIWidget::onPositionChange(); - adjustChilds(); + adjustChildren(); } const double& UISpinBox::getValue() const { @@ -274,7 +274,7 @@ void UISpinBox::onAlphaChange() { } void UISpinBox::onPaddingChange() { - adjustChilds(); + adjustChildren(); UIWidget::onPaddingChange(); } diff --git a/src/eepp/ui/uistacklayout.cpp b/src/eepp/ui/uistacklayout.cpp index 01659c775..0e28c1b10 100644 --- a/src/eepp/ui/uistacklayout.cpp +++ b/src/eepp/ui/uistacklayout.cpp @@ -32,7 +32,7 @@ bool UIStackLayout::isType( const Uint32& type ) const { return UIStackLayout::getType() == type ? true : UILayout::isType( type ); } -void UIStackLayout::applySizePolicyOnChilds() { +void UIStackLayout::applySizePolicyOnChildren() { Node* child = mChild; while ( NULL != child ) { @@ -215,7 +215,7 @@ void UIStackLayout::updateLayout() { if ( size != getPixelsSize() ) setInternalPixelsSize( size ); - applySizePolicyOnChilds(); + applySizePolicyOnChildren(); Float curX = mPaddingPx.Left; Node* child = mChild; diff --git a/src/eepp/ui/uistyle.cpp b/src/eepp/ui/uistyle.cpp index 0441a9605..176b2b141 100644 --- a/src/eepp/ui/uistyle.cpp +++ b/src/eepp/ui/uistyle.cpp @@ -183,17 +183,17 @@ void UIStyle::reloadFontFamily() { } void UIStyle::addStructurallyVolatileChild( UIWidget* widget ) { - if ( mStructurallyVolatileChilds.count( widget ) == 0 ) { - mStructurallyVolatileChilds.insert( widget ); + if ( mStructurallyVolatileChildren.count( widget ) == 0 ) { + mStructurallyVolatileChildren.insert( widget ); } } void UIStyle::removeStructurallyVolatileChild( UIWidget* widget ) { - mStructurallyVolatileChilds.erase( widget ); + mStructurallyVolatileChildren.erase( widget ); } -UnorderedSet& UIStyle::getStructurallyVolatileChilds() { - return mStructurallyVolatileChilds; +UnorderedSet& UIStyle::getStructurallyVolatileChildren() { + return mStructurallyVolatileChildren; } bool UIStyle::hasProperty( const CSS::PropertyId& propertyId ) const { diff --git a/src/eepp/ui/uitableview.cpp b/src/eepp/ui/uitableview.cpp index 3b805f5b4..3bbad6747 100644 --- a/src/eepp/ui/uitableview.cpp +++ b/src/eepp/ui/uitableview.cpp @@ -50,7 +50,7 @@ void UITableView::drawChildren() { if ( yOffset - mScrollOffset.y + rowHeight < 0 ) continue; UITableRow* rowNode = updateRow( realRowIndex, rowIndex, yOffset ); - rowNode->setChildsVisibility( false, false ); + rowNode->setChildrenVisibility( false, false ); realColIndex = 0; for ( size_t colIndex = 0; colIndex < colCount; colIndex++ ) { auto& colData = columnData( colIndex ); diff --git a/src/eepp/ui/uitextinput.cpp b/src/eepp/ui/uitextinput.cpp index d9229e18e..e55576080 100644 --- a/src/eepp/ui/uitextinput.cpp +++ b/src/eepp/ui/uitextinput.cpp @@ -790,7 +790,7 @@ Uint32 UITextInput::onTextInput( const TextInputEvent& event ) { return 0; if ( mLastExecuteEventId == getUISceneNode()->getWindow()->getInput()->getEventsSentId() && - !TextDocument::isTextDocummentCommand( mLastCmdHash ) ) + !TextDocument::isTextDocumentCommand( mLastCmdHash ) ) return 0; const String& text = event.getText(); diff --git a/src/eepp/ui/uitheme.cpp b/src/eepp/ui/uitheme.cpp index 5286cec68..16eacc5fc 100644 --- a/src/eepp/ui/uitheme.cpp +++ b/src/eepp/ui/uitheme.cpp @@ -149,7 +149,7 @@ UITheme* UITheme::loadFromTextureAtlas( UITheme* tTheme, Graphics::TextureAtlas* return tTheme; } -UITheme* UITheme::loadFromDirectroy( UITheme* tTheme, const std::string& Path, +UITheme* UITheme::loadFromDirectory( UITheme* tTheme, const std::string& Path, const Float& pixelDensity ) { Clock TE; @@ -258,9 +258,9 @@ UITheme* UITheme::loadFromDirectroy( UITheme* tTheme, const std::string& Path, return tTheme; } -UITheme* UITheme::loadFromDirectroy( const std::string& Path, const std::string& Name, +UITheme* UITheme::loadFromDirectory( const std::string& Path, const std::string& Name, const std::string& NameAbbr, const Float& pixelDensity ) { - return loadFromDirectroy( UITheme::New( Name, NameAbbr ), Path, pixelDensity ); + return loadFromDirectory( UITheme::New( Name, NameAbbr ), Path, pixelDensity ); } UITheme* UITheme::loadFromTextureAtlas( Graphics::TextureAtlas* TextureAtlas, diff --git a/src/eepp/ui/uitouchdraggablewidget.cpp b/src/eepp/ui/uitouchdraggablewidget.cpp index 85339d5e1..adf632ed2 100644 --- a/src/eepp/ui/uitouchdraggablewidget.cpp +++ b/src/eepp/ui/uitouchdraggablewidget.cpp @@ -58,7 +58,7 @@ UITouchDraggableWidget::setTouchDragDeceleration( const Vector2f& touchDragDecel void UITouchDraggableWidget::onTouchDragValueChange( Vector2f ) {} -bool UITouchDraggableWidget::isTouchOverAllowedChilds() { +bool UITouchDraggableWidget::isTouchOverAllowedChildren() { return isMouseOverMeOrChildren(); } @@ -130,7 +130,7 @@ void UITouchDraggableWidget::scheduledUpdate( const Time& time ) { Uint32 UITouchDraggableWidget::onMessage( const NodeMessage* msg ) { if ( msg->getMsg() == NodeMessage::MouseDown && ( msg->getFlags() & EE_BUTTON_LMASK ) && - !isTouchDragging() && isTouchOverAllowedChilds() && + !isTouchDragging() && isTouchOverAllowedChildren() && !getEventDispatcher()->isNodeDragging() && isTouchDragEnabled() ) { setTouchDragging( true ); getEventDispatcher()->setNodeDragging( this ); @@ -138,7 +138,7 @@ Uint32 UITouchDraggableWidget::onMessage( const NodeMessage* msg ) { mTouchDragAcceleration = Vector2f( 0, 0 ); return 1; } else if ( msg->getMsg() == NodeMessage::MouseUp && ( msg->getFlags() & EE_BUTTON_LMASK ) && - isTouchDragging() && isTouchOverAllowedChilds() ) { + isTouchDragging() && isTouchOverAllowedChildren() ) { setTouchDragging( false ); getEventDispatcher()->setNodeDragging( nullptr ); return 1; diff --git a/src/eepp/ui/uitreeview.cpp b/src/eepp/ui/uitreeview.cpp index 8636d1e87..89ec4089d 100644 --- a/src/eepp/ui/uitreeview.cpp +++ b/src/eepp/ui/uitreeview.cpp @@ -355,7 +355,7 @@ void UITreeView::drawChildren() { return IterationDecision::Continue; Float xOffset = 0; UITableRow* rowNode = updateRow( v.realRowIndex, index, yOffset ); - rowNode->setChildsVisibility( false, false ); + rowNode->setChildrenVisibility( false, false ); v.realColIndex = 0; for ( size_t colIndex = 0; colIndex < getModel()->columnCount(); colIndex++ ) { auto& colData = columnData( colIndex ); diff --git a/src/eepp/ui/uiviewpager.cpp b/src/eepp/ui/uiviewpager.cpp index d0b7de4b3..298f6787c 100644 --- a/src/eepp/ui/uiviewpager.cpp +++ b/src/eepp/ui/uiviewpager.cpp @@ -56,11 +56,11 @@ void UIViewPager::onChildCountChange( Node* child, const bool& removed ) { if ( child != mContainer ) { mTotalPages = mContainer->getChildCount(); - updateChilds(); + updateChildren(); } if ( !removed && child != mContainer ) { - child->on( Event::OnPositionChange, [this]( const Event* ) { updateChilds(); } ); + child->on( Event::OnPositionChange, [this]( const Event* ) { updateChildren(); } ); } UIWidget::onChildCountChange( child, removed ); @@ -116,7 +116,7 @@ void UIViewPager::setTimingFunction( const Ease::Interpolation& timingFunction ) } void UIViewPager::onSizeChange() { - updateChilds(); + updateChildren(); UIWidget::onSizeChange(); } @@ -141,7 +141,7 @@ Uint32 UIViewPager::onMessage( const NodeMessage* Msg ) { return UIWidget::onMessage( Msg ); } -void UIViewPager::updateChilds() { +void UIViewPager::updateChildren() { Float containerLength = mOrientation == UIOrientation::Horizontal ? getSize().getWidth() * mTotalPages : getSize().getHeight() * mTotalPages; diff --git a/src/eepp/ui/uiwidget.cpp b/src/eepp/ui/uiwidget.cpp index 7e2442803..a957cf897 100644 --- a/src/eepp/ui/uiwidget.cpp +++ b/src/eepp/ui/uiwidget.cpp @@ -326,10 +326,10 @@ void UIWidget::onChildCountChange( Node* child, const bool& removed ) { } if ( !isSceneNodeLoading() && mUISceneNode != NULL && mStyle != NULL ) { - // Childs that are structurally volatile can change states when a new + // Children that are structurally volatile can change states when a new // element is added to the parent. We pre-store them and invalidate its // state if that's the case. - auto& svc = mStyle->getStructurallyVolatileChilds(); + auto& svc = mStyle->getStructurallyVolatileChildren(); for ( auto& child : svc ) { mUISceneNode->invalidateStyleState( child ); } @@ -1107,7 +1107,7 @@ UIStyle* UIWidget::getUIStyle() const { return mStyle; } -void UIWidget::reloadStyle( bool reloadChilds, bool disableAnimations, bool reportStateChange, +void UIWidget::reloadStyle( bool reloadChildren, bool disableAnimations, bool reportStateChange, bool forceReApplyProperties, bool resetPropertyCache ) { createStyle(); @@ -1119,12 +1119,12 @@ void UIWidget::reloadStyle( bool reloadChilds, bool disableAnimations, bool repo if ( resetPropertyCache ) mStyle->resetCachedProperties(); - if ( NULL != getFirstChild() && reloadChilds ) { + if ( NULL != getFirstChild() && reloadChildren ) { Node* child = getFirstChild(); while ( NULL != child ) { if ( child->isWidget() ) - child->asType()->reloadStyle( reloadChilds, disableAnimations, + child->asType()->reloadStyle( reloadChildren, disableAnimations, reportStateChange, forceReApplyProperties, resetPropertyCache ); @@ -1737,8 +1737,8 @@ bool UIWidget::applyProperty( const StyleSheetProperty& attribute ) { } else if ( "auto_padding" == cur || "autopadding" == cur ) { setFlags( UI_AUTO_PADDING ); notifyLayoutAttrChange(); - } else if ( "reportsizechangetochilds" == cur || - "report_size_change_to_childs" == cur ) { + } else if ( "reportsizechangetochildren" == cur || + "report_size_change_to_children" == cur ) { enableReportSizeChangeToChildren(); } } @@ -1894,7 +1894,7 @@ bool UIWidget::applyProperty( const StyleSheetProperty& attribute ) { case PropertyId::Opacity: { Float alpha = eemin( attribute.asFloat() * 255.f, 255.f ); setAlpha( alpha ); - setChildsAlpha( alpha ); + setChildrenAlpha( alpha ); break; } case PropertyId::Cursor: @@ -2002,7 +2002,7 @@ void UIWidget::loadFromXmlNode( const pugi::xml_node& node ) { for ( pugi::xml_attribute_iterator ait = node.attributes_begin(); ait != node.attributes_end(); ++ait ) { - // Create a property without triming its value + // Create a property without trimming its value StyleSheetProperty prop( ait->name(), ait->value(), false, StyleSheetSelectorRule::SpecificityInline ); @@ -2083,7 +2083,7 @@ std::string UIWidget::getFlagsString() const { flagvec.push_back( "multiselect" ); if ( mFlags & UI_AUTO_PADDING ) flagvec.push_back( "autopadding" ); - if ( reportSizeChangeToChilds() ) + if ( reportSizeChangeToChildren() ) flagvec.push_back( "reportsizechangetochilds" ); if ( isClipped() ) flagvec.push_back( "clip" ); diff --git a/src/eepp/ui/uiwidgettable.cpp b/src/eepp/ui/uiwidgettable.cpp index 0d17899a1..63c5a6312 100644 --- a/src/eepp/ui/uiwidgettable.cpp +++ b/src/eepp/ui/uiwidgettable.cpp @@ -645,7 +645,7 @@ void UIWidgetTable::onTouchDragValueChange( Vector2f diff ) { mHScrollBar->setValue( mHScrollBar->getValue() + ( -diff.x / mTotalWidth ) ); } -bool UIWidgetTable::isTouchOverAllowedChilds() { +bool UIWidgetTable::isTouchOverAllowedChildren() { return isMouseOverMeOrChildren() && !mVScrollBar->isMouseOverMeOrChildren() && !mHScrollBar->isMouseOverMeOrChildren(); } diff --git a/src/eepp/ui/undostack.cpp b/src/eepp/ui/undostack.cpp index 83223ac37..6e75706b4 100644 --- a/src/eepp/ui/undostack.cpp +++ b/src/eepp/ui/undostack.cpp @@ -10,11 +10,11 @@ UndoCommand::UndoCommand( const std::string& text, UndoCommand* parent ) : UndoC UndoCommand::UndoCommand( UndoCommand* parent ) { if ( parent != nullptr ) - parent->mChilds.push_back( this ); + parent->mChildren.push_back( this ); } UndoCommand::~UndoCommand() { - for ( const auto& child : mChilds ) + for ( const auto& child : mChildren ) delete child; } @@ -35,13 +35,13 @@ bool UndoCommand::mergeWith( const UndoCommand* ) { } void UndoCommand::redo() { - for ( std::size_t i = 0; i < mChilds.size(); ++i ) - mChilds.at( i )->redo(); + for ( std::size_t i = 0; i < mChildren.size(); ++i ) + mChildren.at( i )->redo(); } void UndoCommand::undo() { - for ( int i = mChilds.size() - 1; i >= 0; --i ) - mChilds.at( i )->undo(); + for ( int i = mChildren.size() - 1; i >= 0; --i ) + mChildren.at( i )->undo(); } std::string UndoCommand::text() const { @@ -64,13 +64,13 @@ void UndoCommand::setText( const std::string& text ) { } int UndoCommand::childCount() const { - return mChilds.size(); + return mChildren.size(); } const UndoCommand* UndoCommand::child( int index ) const { - if ( index < 0 || index >= static_cast( mChilds.size() ) ) + if ( index < 0 || index >= static_cast( mChildren.size() ) ) return nullptr; - return mChilds.at( index ); + return mChildren.at( index ); } void UndoStack::setIndex( int idx, bool clean ) { @@ -153,8 +153,8 @@ void UndoStack::push( UndoCommand* cmd ) { UndoCommand* cur = nullptr; if ( macro ) { UndoCommand* macroCmd = mMacroStack.back(); - if ( !macroCmd->mChilds.empty() ) - cur = macroCmd->mChilds.back(); + if ( !macroCmd->mChildren.empty() ) + cur = macroCmd->mChildren.back(); } else { if ( mIndex > 0 ) cur = mCommands.at( mIndex - 1 ); @@ -174,8 +174,8 @@ void UndoStack::push( UndoCommand* cmd ) { if ( macro ) { if ( cur->isObsolete() ) { - delete mMacroStack.back()->mChilds.back(); - mMacroStack.back()->mChilds.pop_back(); + delete mMacroStack.back()->mChildren.back(); + mMacroStack.back()->mChildren.pop_back(); } } else { if ( cur->isObsolete() ) { @@ -195,7 +195,7 @@ void UndoStack::push( UndoCommand* cmd ) { delete cmd; // command should be deleted and NOT added to the stack } else { if ( macro ) { - mMacroStack.back()->mChilds.push_back( cmd ); + mMacroStack.back()->mChildren.push_back( cmd ); } else { mCommands.push_back( cmd ); checkUndoLimit(); @@ -395,7 +395,7 @@ void UndoStack::beginMacro( const std::string& text ) { mCleanIndex = -1; // we've deleted the clean state mCommands.push_back( cmd ); } else { - mMacroStack.back()->mChilds.push_back( cmd ); + mMacroStack.back()->mChildren.push_back( cmd ); } mMacroStack.push_back( cmd ); diff --git a/src/eepp/window/window.cpp b/src/eepp/window/window.cpp index 8ec036084..2db1582cb 100644 --- a/src/eepp/window/window.cpp +++ b/src/eepp/window/window.cpp @@ -481,7 +481,7 @@ void Window::sendVideoResizeCb() { void Window::logSuccessfulInit( const std::string& BackendName ) { std::string msg( String::format( - "Engine Initialized Succesfully.\n\tVersion: %s (codename: \"%s\")\n\tBuild time: " + "Engine Initialized Successfully.\n\tVersion: %s (codename: \"%s\")\n\tBuild time: " "%s\n\tPlatform: %s\n\tOS: %s\n\tArch: %s\n\tCPU Cores: %d\n\tProcess Path: %s\n\tCurrent " "Working Directory: %s\n\tHome Directory: %s\n\tDisk Free Space: %s\n\tWindow/Input " "Backend: %s\n\tGL Backend: %s\n\tGL Vendor: %s\n\tGL Renderer: %s\n\tGL Version: " diff --git a/src/examples/7guis/cells/cells.cpp b/src/examples/7guis/cells/cells.cpp index 94d35aeb9..df32f466f 100644 --- a/src/examples/7guis/cells/cells.cpp +++ b/src/examples/7guis/cells/cells.cpp @@ -1,7 +1,7 @@ #include "spreadsheet.hpp" #include -// Referece https://eugenkiss.github.io/7guis/tasks/#cells +// Reference https://eugenkiss.github.io/7guis/tasks/#cells EE_MAIN_FUNC int main( int, char** ) { UIApplication app( { 1280, 768, "eepp - 7GUIs - Cells" } ); UIWidget* rlay = app.getUI()->loadLayoutFromString( R"xml( diff --git a/src/examples/external_shader/external_shader.cpp b/src/examples/external_shader/external_shader.cpp index 01aee8ebb..71abc7eaf 100644 --- a/src/examples/external_shader/external_shader.cpp +++ b/src/examples/external_shader/external_shader.cpp @@ -5,7 +5,7 @@ namespace Demo_ExternalShader { #if defined( EE_ARM ) || EE_PLATFORM == EE_PLATFORM_EMSCRIPTEN -static Float sqrt_aprox[20001]; +static Float sqrt_approx[20001]; #endif Uint32 ParticlesNum = 30000; @@ -155,7 +155,7 @@ void mainLoop() { #if !defined( EE_ARM ) && EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN Float d = eesqrt( distance ); #else - Float d = sqrt_aprox[( Int32 )( distance * 1000 )]; + Float d = sqrt_approx[( Int32 )( distance * 1000 )]; #endif if ( d < 2.f ) { @@ -264,7 +264,7 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) { #if defined( EE_ARM ) || EE_PLATFORM == EE_PLATFORM_EMSCRIPTEN Float tFloat = 0; for ( int i = 0; i <= 20000; i++ ) { - sqrt_aprox[i] = eesqrt( tFloat ); + sqrt_approx[i] = eesqrt( tFloat ); tFloat += 0.001; } #endif diff --git a/src/examples/http_request/http_request.cpp b/src/examples/http_request/http_request.cpp index 973d67581..118d72eca 100644 --- a/src/examples/http_request/http_request.cpp +++ b/src/examples/http_request/http_request.cpp @@ -85,7 +85,7 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) { // If the user provided the URL, creates an instance of URI to parse it. URI uri( url.Get() ); - // If no scheme provided asume HTTP + // If no scheme provided assume HTTP if ( uri.getScheme().empty() ) { uri = URI( "http://" + url.Get() ); } @@ -248,7 +248,7 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) { // Set follow redirect request.setFollowRedirect( location.Get() ); - // Set the maximun number of redirects + // Set the maximum number of redirects if ( maxRedirs ) { request.setMaxRedirects( maxRedirs.Get() ); } diff --git a/src/examples/physics/physics.cpp b/src/examples/physics/physics.cpp index c98db43e4..b7e058610 100644 --- a/src/examples/physics/physics.cpp +++ b/src/examples/physics/physics.cpp @@ -4,7 +4,7 @@ using namespace EE::Physics; /** The physics module is a OOP wrapper for Chipmunk Physics. -To understand the conceptos of space, body, shapes, etc you can read the +To understand the concepts of space, body, shapes, etc you can read the Chipmunk documentation: http://chipmunk-physics.net/release/ChipmunkLatest-Docs/ */ @@ -136,7 +136,7 @@ void demo1Create() { mSpace = Physics::Space::New(); mSpace->setIterations( 1 ); - // The space will contain a very large number of similary sized objects. + // The space will contain a very large number of similarly sized objects. // This is the perfect candidate for using the spatial hash. // Generally you will never need to do this. mSpace->useSpatialHash( 2.0, 10000 ); @@ -194,30 +194,30 @@ void demo2Create() { mSpace->setGravity( cVectNew( 0, 100 ) ); mSpace->setSleepTimeThreshold( 0.5f ); - Body *body, *statiBody = mSpace->getStaticBody(); + Body *body, *staticBody = mSpace->getStaticBody(); Shape* shape; shape = mSpace->addShape( - ShapeSegment::New( statiBody, cVectNew( 0, mWindow->getHeight() ), + ShapeSegment::New( staticBody, cVectNew( 0, mWindow->getHeight() ), cVectNew( mWindow->getWidth(), mWindow->getHeight() ), 0.0f ) ); shape->setE( 1.0f ); shape->setU( 1.0f ); shape->setLayers( NOT_GRABABLE_MASK ); shape = mSpace->addShape( - ShapeSegment::New( statiBody, cVectNew( mWindow->getWidth(), 0 ), + ShapeSegment::New( staticBody, cVectNew( mWindow->getWidth(), 0 ), cVectNew( mWindow->getWidth(), mWindow->getHeight() ), 0.0f ) ); shape->setE( 1.0f ); shape->setU( 1.0f ); shape->setLayers( NOT_GRABABLE_MASK ); - shape = mSpace->addShape( ShapeSegment::New( statiBody, cVectNew( 0, 0 ), + shape = mSpace->addShape( ShapeSegment::New( staticBody, cVectNew( 0, 0 ), cVectNew( 0, mWindow->getHeight() ), 0.0f ) ); shape->setE( 1.0f ); shape->setU( 1.0f ); shape->setLayers( NOT_GRABABLE_MASK ); - shape = mSpace->addShape( ShapeSegment::New( statiBody, cVectNew( 0, 0 ), + shape = mSpace->addShape( ShapeSegment::New( staticBody, cVectNew( 0, 0 ), cVectNew( mWindow->getWidth(), 0 ), 0.0f ) ); shape->setE( 1.0f ); shape->setU( 1.0f ); @@ -323,21 +323,21 @@ void demo3Create() { mSpace->setIterations( 10 ); mSpace->setGravity( cVectNew( 0, 100 ) ); - Body* statiBody = mSpace->getStaticBody(); + Body* staticBody = mSpace->getStaticBody(); Shape* shape; emitterInstance.queue = 5; emitterInstance.blocked = 0; emitterInstance.position = cVectNew( mWindow->getWidth() / 2, 150 ); - shape = mSpace->addShape( ShapeCircle::New( statiBody, 15.0f, emitterInstance.position ) ); + shape = mSpace->addShape( ShapeCircle::New( staticBody, 15.0f, emitterInstance.position ) ); shape->setSensor( 1 ); shape->setCollisionType( BLOCKING_SENSOR_TYPE ); shape->setData( &emitterInstance ); // Create our catch sensor to requeue the balls when they reach the bottom of the screen shape = mSpace->addShape( - ShapeSegment::New( statiBody, cVectNew( -4000, 600 ), cVectNew( 4000, 600 ), 15.0f ) ); + ShapeSegment::New( staticBody, cVectNew( -4000, 600 ), cVectNew( 4000, 600 ), 15.0f ) ); shape->setSensor( 1 ); shape->setCollisionType( CATCH_SENSOR_TYPE ); shape->setData( &emitterInstance ); @@ -397,7 +397,7 @@ cpBool stickyPreSolve( Arbiter* arb, Space* space, void* ) { cpContactPointSet contacts = arb->getContactPointSet(); for ( int i = 0; i < contacts.count; i++ ) { - // Increase the distance (negative means overlaping) of the + // Increase the distance (negative means overlapping) of the // collision to allow them to overlap more. // This value is used only for fixing the positions of overlapping shapes. cpFloat dist = contacts.points[i].dist + 2.0f * STICK_SENSOR_THICKNESS; @@ -422,7 +422,7 @@ cpBool stickyPreSolve( Arbiter* arb, Space* space, void* ) { // Dont draw the constraint joint->setDrawPointSize( 0 ); - // Give it a finite force for the stickyness. + // Give it a finite force for the stickiness. joint->setMaxForce( 3e3 ); // Schedule a post-step() callback to add the joint. @@ -433,7 +433,7 @@ cpBool stickyPreSolve( Arbiter* arb, Space* space, void* ) { } // Position correction and velocity are handled separately so changing - // the overlap distance alone won't prevent the collision from occuring. + // the overlap distance alone won't prevent the collision from occurring. // Explicitly the collision for this frame if the shapes don't overlap using the new distance. return ( deepest <= 0.0f ); @@ -487,34 +487,34 @@ void demo4Create() { mSpace->setGravity( cVectNew( 0, 1000 ) ); mSpace->setCollisionSlop( 2.0 ); - Body* statiBody = mSpace->getStaticBody(); + Body* staticBody = mSpace->getStaticBody(); Shape* shape; cpFloat x = 500; cpFloat y = 400; - shape = mSpace->addShape( ShapeSegment::New( statiBody, cVectNew( x + -340, y - 260 ), + shape = mSpace->addShape( ShapeSegment::New( staticBody, cVectNew( x + -340, y - 260 ), cVectNew( x - 340, y + 260 ), 20.0f ) ); shape->setElasticity( 1.0f ); shape->setFriction( 1.0f ); shape->setCollisionType( COLLIDE_STICK_SENSOR ); shape->setLayers( NOT_GRABABLE_MASK ); - shape = mSpace->addShape( ShapeSegment::New( statiBody, cVectNew( x + 340, y - 260 ), + shape = mSpace->addShape( ShapeSegment::New( staticBody, cVectNew( x + 340, y - 260 ), cVectNew( x + 340, y + 260 ), 20.0f ) ); shape->setElasticity( 1.0f ); shape->setFriction( 1.0f ); shape->setCollisionType( COLLIDE_STICK_SENSOR ); shape->setLayers( NOT_GRABABLE_MASK ); - shape = mSpace->addShape( ShapeSegment::New( statiBody, cVectNew( x - 340, y - 260 ), + shape = mSpace->addShape( ShapeSegment::New( staticBody, cVectNew( x - 340, y - 260 ), cVectNew( x + 340, y - 260 ), 20.0f ) ); shape->setElasticity( 1.0f ); shape->setFriction( 1.0f ); shape->setCollisionType( COLLIDE_STICK_SENSOR ); shape->setLayers( NOT_GRABABLE_MASK ); - shape = mSpace->addShape( ShapeSegment::New( statiBody, cVectNew( x - 340, y + 260 ), + shape = mSpace->addShape( ShapeSegment::New( staticBody, cVectNew( x - 340, y + 260 ), cVectNew( x + 340, y + 260 ), 20.0f ) ); shape->setElasticity( 1.0f ); shape->setFriction( 1.0f ); diff --git a/src/examples/sound/sound.cpp b/src/examples/sound/sound.cpp index 49ec6ef5b..d29038df6 100644 --- a/src/examples/sound/sound.cpp +++ b/src/examples/sound/sound.cpp @@ -12,7 +12,7 @@ void playSound() { // Get the sound buffer to display the buffer information SoundBuffer& buffer = soundManager.getBuffer( "sound" ); - // Display sound informations + // Display sound information std::cout << "sound.ogg :" << std::endl; std::cout << " " << buffer.getDuration().asSeconds() << " seconds" << std::endl; std::cout << " " << buffer.getSampleRate() << " samples / sec" << std::endl; @@ -39,7 +39,7 @@ void playMusic( std::string path = "assets/sounds/music.ogg" ) { if ( !music.openFromFile( path ) ) return; - // Display music informations + // Display music information std::cout << FileSystem::fileNameFromPath( path ) << " :" << std::endl; std::cout << " " << music.getDuration().asSeconds() << " seconds" << std::endl; std::cout << " " << music.getSampleRate() << " samples / sec" << std::endl; diff --git a/src/examples/sprites/sprites.cpp b/src/examples/sprites/sprites.cpp index fd86018e3..5419aeb33 100644 --- a/src/examples/sprites/sprites.cpp +++ b/src/examples/sprites/sprites.cpp @@ -11,7 +11,7 @@ Interpolation1d PlanetAngle; Primitives P; Sprite Rock; Sprite Planet; -Sprite Blindy; +Sprite Monster; // Define a user sprite event static const Uint32 USER_SPRITE_EVENT = Sprite::SPRITE_EVENT_USER + 1; @@ -73,8 +73,8 @@ void mainLoop() { // Draw the animated Rock sprite Rock.draw(); - // Draw the blindy animation - Blindy.draw(); + // Draw the monster animation + Monster.draw(); // Draw the Rock Axis-Aligned Bounding Box P.setColor( Color( 255, 255, 255, 255 ) ); @@ -125,17 +125,17 @@ EE_MAIN_FUNC int main( int, char*[] ) { // ) animation by its name, it will search for "gn00" to "gnXX" to create a new animation // see TextureAtlasManager::GetTextureRegionsByPattern for more information. // This is the easiest way to load animated sprites. - Blindy.addFramesByPattern( "gn" ); + Monster.addFramesByPattern( "gn" ); // Set the sprite animation speed, set in Frames per Second // Sprites are auto-animated by default. Rock.setAnimationSpeed( 32 ); // Set the render mode of the sprite - Blindy.setRenderMode( RENDER_MIRROR ); + Monster.setRenderMode( RENDER_MIRROR ); // Set the Blend Mode of the sprite - Blindy.setBlendMode( BlendMode::Add() ); + Monster.setBlendMode( BlendMode::Add() ); // Set the primitive fill mode P.setFillMode( DRAW_LINE ); @@ -151,9 +151,9 @@ EE_MAIN_FUNC int main( int, char*[] ) { Rock.setPosition( Vector2f( ScreenCenter.x - Rock.getAABB().getSize().getWidth() / 2, ScreenCenter.y - Rock.getAABB().getSize().getHeight() / 2 ) ); - Blindy.setPosition( - Vector2f( ScreenCenter.x - Blindy.getAABB().getSize().getWidth() / 2, - ScreenCenter.y - Blindy.getAABB().getSize().getHeight() / 2 ) ); + Monster.setPosition( + Vector2f( ScreenCenter.x - Monster.getAABB().getSize().getWidth() / 2, + ScreenCenter.y - Monster.getAABB().getSize().getHeight() / 2 ) ); // Set the planet angle interpolation PlanetAngle.add( 0 ); diff --git a/src/examples/ui_custom_widget/ui_custom_widget.cpp b/src/examples/ui_custom_widget/ui_custom_widget.cpp index 2f8b55f4d..40f20c062 100644 --- a/src/examples/ui_custom_widget/ui_custom_widget.cpp +++ b/src/examples/ui_custom_widget/ui_custom_widget.cpp @@ -40,7 +40,7 @@ class UISineWaveWidget : public UIWidget { UISineWaveWidget() : UIWidget( - "sinewavewidget" ) // parameter is the element tag (for accesing the element from CSS) + "sinewavewidget" ) // parameter is the element tag (for accessing the element from CSS) {} }; diff --git a/src/modules/maps/include/eepp/maps/gameobject.hpp b/src/modules/maps/include/eepp/maps/gameobject.hpp index aab82c641..d82b3a8fe 100644 --- a/src/modules/maps/include/eepp/maps/gameobject.hpp +++ b/src/modules/maps/include/eepp/maps/gameobject.hpp @@ -55,9 +55,9 @@ class EE_MAPS_API GameObject { void setMirrored( bool mirrored ); - bool isFliped() const; + bool isFlipped() const; - void setFliped( bool fliped ); + void setFlipped( bool flipped ); bool isBlendAdd() const; diff --git a/src/modules/maps/include/eepp/maps/mapeditor/mapeditor.hpp b/src/modules/maps/include/eepp/maps/mapeditor/mapeditor.hpp index 340800d96..f44755e29 100644 --- a/src/modules/maps/include/eepp/maps/mapeditor/mapeditor.hpp +++ b/src/modules/maps/include/eepp/maps/mapeditor/mapeditor.hpp @@ -37,10 +37,10 @@ class EE_MAPS_API MapEditor { public: typedef std::function MapEditorCloseCb; - static MapEditor* New( UIWindow* AttatchTo = NULL, + static MapEditor* New( UIWindow* AttachTo = NULL, const MapEditorCloseCb& callback = MapEditorCloseCb() ); - MapEditor( UIWindow* AttatchTo = NULL, const MapEditorCloseCb& callback = MapEditorCloseCb() ); + MapEditor( UIWindow* AttachTo = NULL, const MapEditorCloseCb& callback = MapEditorCloseCb() ); ~MapEditor(); @@ -60,7 +60,7 @@ class EE_MAPS_API MapEditor { UIDropDownList* mGOTypeList; UIDropDownList* mLayerList; UICheckBox* mChkMirrored; - UICheckBox* mChkFliped; + UICheckBox* mChkFlipped; UICheckBox* mChkBlocked; UICheckBox* mChkAnim; UICheckBox* mChkRot90; @@ -107,7 +107,7 @@ class EE_MAPS_API MapEditor { void onBlueChange( const Event* Event ); - void createLighContainer(); + void createLightContainer(); UISelectButton* addObjContButton( String text, Uint32 mode ); diff --git a/src/modules/maps/include/eepp/maps/maphelper.hpp b/src/modules/maps/include/eepp/maps/maphelper.hpp index 6c1d62b20..136b62f85 100644 --- a/src/modules/maps/include/eepp/maps/maphelper.hpp +++ b/src/modules/maps/include/eepp/maps/maphelper.hpp @@ -84,7 +84,7 @@ class GObjFlags { GAMEOBJECT_STATIC = ( 1 << 0 ), GAMEOBJECT_ANIMATED = ( 1 << 1 ), GAMEOBJECT_MIRRORED = ( 1 << 2 ), - GAMEOBJECT_FLIPED = ( 1 << 3 ), + GAMEOBJECT_FLIPPED = ( 1 << 3 ), GAMEOBJECT_BLOCKED = ( 1 << 4 ), GAMEOBJECT_ROTATE_90DEG = ( 1 << 5 ), GAMEOBJECT_AUTO_FIX_TILE_POS = ( 1 << 6 ), diff --git a/src/modules/maps/include/eepp/maps/tilemap.hpp b/src/modules/maps/include/eepp/maps/tilemap.hpp index 0c77b89e8..ed75446c4 100644 --- a/src/modules/maps/include/eepp/maps/tilemap.hpp +++ b/src/modules/maps/include/eepp/maps/tilemap.hpp @@ -102,9 +102,9 @@ class EE_MAPS_API TileMap { void setClampBorders( const bool& clamp ); - bool getClipedArea() const; + bool getClippedArea() const; - void setClipedArea( const bool& clip ); + void setClippedArea( const bool& clip ); Uint32 getDrawGrid() const; diff --git a/src/modules/maps/src/eepp/maps/gameobject.cpp b/src/modules/maps/src/eepp/maps/gameobject.cpp index 27085ace4..bc932b232 100644 --- a/src/modules/maps/src/eepp/maps/gameobject.cpp +++ b/src/modules/maps/src/eepp/maps/gameobject.cpp @@ -61,12 +61,12 @@ void GameObject::setMirrored( bool mirrored ) { : clearFlag( GObjFlags::GAMEOBJECT_MIRRORED ); } -bool GameObject::isFliped() const { - return 0 != ( mFlags & GObjFlags::GAMEOBJECT_FLIPED ); +bool GameObject::isFlipped() const { + return 0 != ( mFlags & GObjFlags::GAMEOBJECT_FLIPPED ); } -void GameObject::setFliped( bool fliped ) { - fliped ? setFlag( GObjFlags::GAMEOBJECT_FLIPED ) : clearFlag( GObjFlags::GAMEOBJECT_FLIPED ); +void GameObject::setFlipped( bool flipped ) { + flipped ? setFlag( GObjFlags::GAMEOBJECT_FLIPPED ) : clearFlag( GObjFlags::GAMEOBJECT_FLIPPED ); } bool GameObject::isBlendAdd() const { @@ -110,11 +110,11 @@ RenderMode GameObject::getRenderModeFromFlags() { RenderMode Render = RENDER_NORMAL; if ( ( mFlags & GObjFlags::GAMEOBJECT_MIRRORED ) && - ( mFlags & GObjFlags::GAMEOBJECT_FLIPED ) ) { + ( mFlags & GObjFlags::GAMEOBJECT_FLIPPED ) ) { Render = RENDER_FLIPPED_MIRRORED; } else if ( mFlags & GObjFlags::GAMEOBJECT_MIRRORED ) { Render = RENDER_MIRROR; - } else if ( mFlags & GObjFlags::GAMEOBJECT_FLIPED ) { + } else if ( mFlags & GObjFlags::GAMEOBJECT_FLIPPED ) { Render = RENDER_FLIPPED; } diff --git a/src/modules/maps/src/eepp/maps/mapeditor/mapeditor.cpp b/src/modules/maps/src/eepp/maps/mapeditor/mapeditor.cpp index 930c416cf..8727c593e 100644 --- a/src/modules/maps/src/eepp/maps/mapeditor/mapeditor.cpp +++ b/src/modules/maps/src/eepp/maps/mapeditor/mapeditor.cpp @@ -45,12 +45,12 @@ static UITextView* createTextBox( const String& Text = "", Node* Parent = NULL, return widget; } -MapEditor* MapEditor::New( UIWindow* AttatchTo, const MapEditor::MapEditorCloseCb& callback ) { - return eeNew( MapEditor, ( AttatchTo, callback ) ); +MapEditor* MapEditor::New( UIWindow* AttachTo, const MapEditor::MapEditorCloseCb& callback ) { + return eeNew( MapEditor, ( AttachTo, callback ) ); } -MapEditor::MapEditor( UIWindow* AttatchTo, const MapEditorCloseCb& callback ) : - mUIWindow( AttatchTo ), +MapEditor::MapEditor( UIWindow* AttachTo, const MapEditorCloseCb& callback ) : + mUIWindow( AttachTo ), mTheme( NULL ), mUIMap( NULL ), mCloseCb( callback ), @@ -254,7 +254,7 @@ void MapEditor::createETGMenu() { createTabs(); - createLighContainer(); + createLightContainer(); createTextureRegionContainer( Width ); @@ -363,14 +363,14 @@ void MapEditor::createTextureRegionContainer( Int32 Width ) { mChkMirrored->addEventListener( Event::OnValueChange, [this]( auto event ) { chkClickMirrored( event ); } ); - mChkFliped = UICheckBox::New(); - mChkFliped->setFontStyle( Text::Shadow ) + mChkFlipped = UICheckBox::New(); + mChkFlipped->setFontStyle( Text::Shadow ) ->resetFlags( ChkFlags ) ->setParent( mTextureRegionCont ) ->setPosition( mChkMirrored->getPosition().x + mChkMirrored->getSize().getWidth() + 32, mChkMirrored->getPosition().y ); - mChkFliped->setText( "Fliped" ); - mChkFliped->addEventListener( Event::OnValueChange, + mChkFlipped->setText( "Flipped" ); + mChkFlipped->addEventListener( Event::OnValueChange, [this]( auto event ) { chkClickFlipped( event ); } ); mChkBlocked = UICheckBox::New(); @@ -388,8 +388,8 @@ void MapEditor::createTextureRegionContainer( Int32 Width ) { mChkAnim->setFontStyle( Text::Shadow ) ->resetFlags( ChkFlags ) ->setParent( mTextureRegionCont ) - ->setPosition( mChkFliped->getPosition().x, - mChkFliped->getPosition().y + mChkFliped->getSize().getHeight() + 4 ); + ->setPosition( mChkFlipped->getPosition().x, + mChkFlipped->getPosition().y + mChkFlipped->getSize().getHeight() + 4 ); mChkAnim->setText( "Animated" ); mChkAnim->setTooltipText( "Indicates if the Sprite is animated." ); mChkAnim->addEventListener( Event::OnValueChange, @@ -505,7 +505,7 @@ void MapEditor::createTextureRegionContainer( Int32 Width ) { fillSGCombo(); } -void MapEditor::createLighContainer() { +void MapEditor::createLightContainer() { UIPushButton* NewLightBut = UIPushButton::New(); NewLightBut->setParent( mLightCont ) ->setSize( mLightCont->getSize().getWidth() - TAB_CONT_X_DIST * 2, 0 ) @@ -851,11 +851,11 @@ void MapEditor::chkClickClampToTile( const Event* ) { } void MapEditor::updateGfx() { - if ( mChkMirrored->isChecked() && mChkFliped->isChecked() ) + if ( mChkMirrored->isChecked() && mChkFlipped->isChecked() ) mGfxPreview->setRenderMode( RENDER_FLIPPED_MIRRORED ); else if ( mChkMirrored->isChecked() ) mGfxPreview->setRenderMode( RENDER_MIRROR ); - else if ( mChkFliped->isChecked() ) + else if ( mChkFlipped->isChecked() ) mGfxPreview->setRenderMode( RENDER_FLIPPED ); else mGfxPreview->setRenderMode( RENDER_NORMAL ); @@ -872,8 +872,8 @@ void MapEditor::updateFlags() { if ( mChkMirrored->isChecked() ) mCurGOFlags |= GObjFlags::GAMEOBJECT_MIRRORED; - if ( mChkFliped->isChecked() ) - mCurGOFlags |= GObjFlags::GAMEOBJECT_FLIPED; + if ( mChkFlipped->isChecked() ) + mCurGOFlags |= GObjFlags::GAMEOBJECT_FLIPPED; if ( mChkBlocked->isChecked() ) mCurGOFlags |= GObjFlags::GAMEOBJECT_BLOCKED; @@ -1477,12 +1477,12 @@ GameObject* MapEditor::createGameObject() { } else { - Sprite* tStatiSprite = Sprite::New( mGfxPreview->getTextureRegion() ); - tObj = eeNew( GameObjectSprite, ( mCurGOFlags, mCurLayer, tStatiSprite ) ); + Sprite* tStaticSprite = Sprite::New( mGfxPreview->getTextureRegion() ); + tObj = eeNew( GameObjectSprite, ( mCurGOFlags, mCurLayer, tStaticSprite ) ); } } else { //! Creates an empty game object. The client will interpret the GameObject Type, and - //! instanciate the corresponding class. + //! instantiate the corresponding class. if ( mChkDI->isChecked() ) tObj = eeNew( GameObjectVirtual, ( String::hash( mDataIdInput->getText().toUtf8() ), diff --git a/src/modules/maps/src/eepp/maps/mapeditor/uimapnew.cpp b/src/modules/maps/src/eepp/maps/mapeditor/uimapnew.cpp index a5ed55dd0..3f774bc75 100644 --- a/src/modules/maps/src/eepp/maps/mapeditor/uimapnew.cpp +++ b/src/modules/maps/src/eepp/maps/mapeditor/uimapnew.cpp @@ -185,7 +185,7 @@ UIMapNew::UIMapNew( UIMap* Map, std::function NewMapCb, bool ResizeMap ) mUIClipArea->setChecked( true ); if ( ResizeMap ) { - mUIClipArea->setChecked( 0 != mUIMap->Map()->getClipedArea() ); + mUIClipArea->setChecked( 0 != mUIMap->Map()->getClippedArea() ); } Txt = diff --git a/src/modules/maps/src/eepp/maps/tilemap.cpp b/src/modules/maps/src/eepp/maps/tilemap.cpp index b7649f33f..1b8b1ed5b 100644 --- a/src/modules/maps/src/eepp/maps/tilemap.cpp +++ b/src/modules/maps/src/eepp/maps/tilemap.cpp @@ -210,7 +210,7 @@ MapLayer* TileMap::getLayer( const std::string& name ) { void TileMap::draw() { GlobalBatchRenderer::instance()->draw(); - if ( getClipedArea() ) { + if ( getClippedArea() ) { GLi->getClippingMask()->clipPlaneEnable( mScreenPos.x, mScreenPos.y, mViewSize.x, mViewSize.y ); } @@ -248,7 +248,7 @@ void TileMap::draw() { GLi->popMatrix(); - if ( getClipedArea() ) { + if ( getClippedArea() ) { GLi->getClippingMask()->clipPlaneDisable(); } } @@ -565,11 +565,11 @@ Uint32 TileMap::getDrawBackground() const { return mFlags & MAP_FLAG_DRAW_BACKGROUND; } -bool TileMap::getClipedArea() const { +bool TileMap::getClippedArea() const { return 0 != ( mFlags & MAP_FLAG_CLIP_AREA ); } -void TileMap::setClipedArea( const bool& clip ) { +void TileMap::setClippedArea( const bool& clip ) { BitOp::setBitFlagValue( &mFlags, MAP_FLAG_CLIP_AREA, clip ? 1 : 0 ); } diff --git a/src/tests/test_all/test.cpp b/src/tests/test_all/test.cpp index 78b8e3fcd..75b7a912d 100644 --- a/src/tests/test_all/test.cpp +++ b/src/tests/test_all/test.cpp @@ -188,7 +188,7 @@ void EETest::init() { WP.setDuration( Milliseconds( 5000 ) ); WP.start(); - Batch.allocVertexs( 2048 ); + Batch.allocVertices( 2048 ); Batch.setBlendMode( BlendMode::Add() ); mFBO = FrameBuffer::New( 256, 256 ); @@ -265,7 +265,7 @@ void EETest::onFontLoaded() { eeASSERT( TTF != NULL ); eeASSERT( monospace != NULL ); - mBuda = String::fromUtf8( + mBuddha = String::fromUtf8( "El mono ve el pez en el agua y sufre. Piensa que su mundo es el único que existe, el " "mejor, el real. Sufre porque es bueno y tiene compasión, lo ve y piensa: \"Pobre se está " "ahogando no puede respirar\". Y lo saca, lo saca y se queda tranquilo, por fin lo salvé. " @@ -479,7 +479,7 @@ void EETest::createBaseUI() { UITextEdit* TextEdit = UITextEdit::New(); TextEdit->setFlags( UI_WORD_WRAP ); TextEdit->setParent( C )->setPosition( 5, 245 )->setSize( 315, 130 ); - TextEdit->setText( mBuda ); + TextEdit->setText( mBuddha ); UIWidgetTable* genGrid = UIWidgetTable::New(); genGrid->setSmoothScroll( true )->setFlags( UI_TOUCH_DRAG_ENABLED ); @@ -679,7 +679,7 @@ void EETest::createNewUI() { ->setParent( container ); radioButton->setBackgroundColor( 0x33333333 ); radioButton->setBorderColor( 0x66666666 ); - radioButton->setText( "Happy RadioButon :)" ); + radioButton->setText( "Happy RadioButton :)" ); radioButton->setFontColor( Color::Black ); UICheckBox* cbox = UICheckBox::New(); @@ -776,7 +776,7 @@ void EETest::createNewUI() { UITextEdit* textEdit = UITextEdit::New(); textEdit->setFlags( UI_WORD_WRAP ); textEdit->setPosition( 350, 4 )->setSize( 200, 200 )->setParent( container ); - textEdit->setText( mBuda ); + textEdit->setText( mBuddha ); UISpinBox* spinBox = UISpinBox::New(); spinBox->setPosition( 350, 210 )->setSize( 200, 0 )->setParent( container ); @@ -1155,25 +1155,25 @@ void EETest::createDecoratedWindow() { TEdit->setFlags( UI_WORD_WRAP ); TEdit->setParent( TabWidget ); TEdit->addEventListener( Event::OnSizeChange, - [this, TEdit]( const Event* ) { TEdit->setText( mBuda ); } ); + [this, TEdit]( const Event* ) { TEdit->setText( mBuddha ); } ); TabWidget->add( "TextEdit", TEdit ); UITextInput* Txt = UITextInput::New(); Txt->setFlags( UI_WORD_WRAP ); Txt->setParent( TabWidget ); - Txt->setText( mBuda ); + Txt->setText( mBuddha ); TabWidget->add( "TextInput", Txt ); UITextView* txtBox = UITextView::New(); txtBox->resetFlags( UI_HALIGN_LEFT | UI_VALIGN_TOP | UI_AUTO_PADDING | UI_WORD_WRAP | UI_TEXT_SELECTION_ENABLED ); txtBox->setParent( TabWidget ); - txtBox->setText( mBuda ); + txtBox->setText( mBuddha ); TabWidget->add( "TextBox", txtBox ); UICodeEditor* codeEditor = UICodeEditor::New(); codeEditor->setParent( TabWidget ); - codeEditor->getDocument().textInput( mBuda ); + codeEditor->getDocument().textInput( mBuddha ); TabWidget->add( "CodeEditor", codeEditor ); } @@ -1481,8 +1481,8 @@ void EETest::loadTextures() { mTGL = TextureAtlasLoader::New( MyPath + "atlases/bnb" + EE_TEXTURE_ATLAS_EXTENSION ); - mBlindy.addFramesByPattern( "rn" ); - mBlindy.setPosition( Vector2f( 320.f, 0.f ) ); + mMonster.addFramesByPattern( "rn" ); + mMonster.setPosition( Vector2f( 320.f, 0.f ) ); mBoxSprite = Sprite::New( GlobalTextureAtlas::instance()->add( TextureRegion::New( TN[3], "ilmare" ) ) ); @@ -1493,7 +1493,7 @@ void EETest::loadTextures() { Map.loadFromFile( MyPath + "maps/test.eem" ); Map.setDrawGrid( false ); - Map.setClipedArea( false ); + Map.setClippedArea( false ); Map.setDrawBackground( false ); Map.setViewSize( mWindow->getSize().asFloat() ); @@ -1756,8 +1756,8 @@ void EETest::screen4() { mFBO->clear(); if ( NULL != mVBO ) { - mBlindy.setPosition( Vector2f( 128 - 16, 128 - 16 ) ); - mBlindy.draw(); + mMonster.setPosition( Vector2f( 128 - 16, 128 - 16 ) ); + mMonster.draw(); mVBO->bind(); mVBO->draw(); @@ -2374,21 +2374,21 @@ void EETest::demo2Create() { mSpace->setIterations( 10 ); mSpace->setGravity( cVectNew( 0, 100 ) ); - Body* statiBody = mSpace->getStaticBody(); + Body* staticBody = mSpace->getStaticBody(); Shape* shape; emitterInstance.queue = 5; emitterInstance.blocked = 0; emitterInstance.position = cVectNew( mWindow->getWidth() / 2, 150 ); - shape = mSpace->addShape( ShapeCircle::New( statiBody, 15.0f, emitterInstance.position ) ); + shape = mSpace->addShape( ShapeCircle::New( staticBody, 15.0f, emitterInstance.position ) ); shape->setSensor( 1 ); shape->setCollisionType( BLOCKING_SENSOR_TYPE ); shape->setData( &emitterInstance ); // Create our catch sensor to requeue the balls when they reach the bottom of the screen shape = mSpace->addShape( - ShapeSegment::New( statiBody, cVectNew( -4000, 600 ), cVectNew( 4000, 600 ), 15.0f ) ); + ShapeSegment::New( staticBody, cVectNew( -4000, 600 ), cVectNew( 4000, 600 ), 15.0f ) ); shape->setSensor( 1 ); shape->setCollisionType( CATCH_SENSOR_TYPE ); shape->setData( &emitterInstance ); diff --git a/src/tests/test_all/test.hpp b/src/tests/test_all/test.hpp index 6e1e0c9ba..c30a35e80 100644 --- a/src/tests/test_all/test.hpp +++ b/src/tests/test_all/test.hpp @@ -120,7 +120,7 @@ class EETest : private Thread { Uint32 mLastFPSLimit; bool mWasMinimized; - String mBuda; + String mBuddha; ResourceLoader mResLoad; void onTextureLoaded( ResourceLoader* ObjLoaded ); @@ -137,7 +137,7 @@ class EETest : private Thread { Float mAxisY; TextureAtlasLoader* mTGL; - Sprite mBlindy; + Sprite mMonster; FrameBuffer* mFBO; VertexBuffer* mVBO; diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp index 2b199bf22..d19294264 100644 --- a/src/tools/ecode/ecode.cpp +++ b/src/tools/ecode/ecode.cpp @@ -518,7 +518,7 @@ UIFileDialog* App::saveFileDialog( UICodeEditor* editor, bool focusOnClose ) { updateEditorState(); } else { UIMessageBox* msg = - UIMessageBox::New( UIMessageBox::OK, i18n( "coudlnt_write_the_file", + UIMessageBox::New( UIMessageBox::OK, i18n( "couldnt_write_the_file", "Couldn't write the file." ) ); msg->setTitle( "Error" ); msg->show(); @@ -1491,15 +1491,15 @@ void App::onTabCreated( UITab* tab, UIWidget* ) { if ( !event->getNode()->isType( UI_TYPE_MENUITEM ) ) return; UIMenuItem* item = event->getNode()->asType(); - UICodeEditor* nce = nullptr; + UICodeEditor* newCe = nullptr; UICodeEditor* ce = nullptr; UIWidget* ncw = nullptr; UIWidget* cw = nullptr; if ( tab->getOwnedWidget()->isType( UI_TYPE_CODEEDITOR ) ) { - nce = tab->getOwnedWidget()->asType(); + newCe = tab->getOwnedWidget()->asType(); ce = mSplitter->getCurEditor(); - if ( nce != ce ) - mSplitter->setCurrentEditor( nce ); + if ( newCe != ce ) + mSplitter->setCurrentEditor( newCe ); } else { ncw = tab->getOwnedWidget()->asType(); cw = mSplitter->getCurWidget(); @@ -1508,7 +1508,7 @@ void App::onTabCreated( UITab* tab, UIWidget* ) { } runCommand( item->getId() ); if ( tab->getOwnedWidget()->isType( UI_TYPE_CODEEDITOR ) ) { - if ( nce != ce && mSplitter->checkEditorExists( ce ) ) + if ( newCe != ce && mSplitter->checkEditorExists( ce ) ) mSplitter->setCurrentEditor( ce ); } else { if ( ncw != cw && mSplitter->checkWidgetExists( cw ) ) @@ -2062,7 +2062,7 @@ void App::createDocDirtyAlert( UICodeEditor* editor, bool showEnableAutoReload ) ->setVisible( showEnableAutoReload ? !editor->getDocument().isDirty() : false ) ->onClick( [editor, docAlert, this]( const MouseEvent* ) { editor->getDocument().reload(); - editor->disableReportSizeChangeToChilds(); + editor->disableReportSizeChangeToChildren(); docAlert->close(); editor->setFocus(); mConfig.editor.autoReloadOnDiskChange = true; @@ -2071,27 +2071,27 @@ void App::createDocDirtyAlert( UICodeEditor* editor, bool showEnableAutoReload ) docAlert->find( "file_reload" )->onClick( [editor, docAlert]( const MouseEvent* ) { editor->getDocument().reload(); - editor->disableReportSizeChangeToChilds(); + editor->disableReportSizeChangeToChildren(); docAlert->close(); editor->setFocus(); } ); docAlert->find( "file_overwrite" )->onClick( [editor, docAlert]( const MouseEvent* ) { editor->getDocument().save(); - editor->disableReportSizeChangeToChilds(); + editor->disableReportSizeChangeToChildren(); docAlert->close(); editor->setFocus(); } ); docAlert->find( "file_ignore" )->onClick( [docAlert, editor]( const MouseEvent* ) { - editor->disableReportSizeChangeToChilds(); + editor->disableReportSizeChangeToChildren(); docAlert->close(); editor->setFocus(); } ); docAlert->runOnMainThread( [docAlert, editor] { - editor->disableReportSizeChangeToChilds(); + editor->disableReportSizeChangeToChildren(); docAlert->close(); editor->setFocus(); }, @@ -2120,20 +2120,20 @@ void App::createDocDoesNotExistsInFSAlert( UICodeEditor* editor ) { editor->enableReportSizeChangeToChildren(); docAlert->find( "file_continue_editing" )->onClick( [docAlert, editor]( const MouseEvent* ) { - editor->disableReportSizeChangeToChilds(); + editor->disableReportSizeChangeToChildren(); docAlert->close(); editor->setFocus(); } ); docAlert->find( "file_close" )->onClick( [this, editor, docAlert]( const MouseEvent* ) { - editor->disableReportSizeChangeToChilds(); + editor->disableReportSizeChangeToChildren(); docAlert->close(); mSplitter->closeTab( editor, UITabWidget::FocusTabBehavior::Default ); } ); docAlert->runOnMainThread( [docAlert, editor] { - editor->disableReportSizeChangeToChilds(); + editor->disableReportSizeChangeToChildren(); docAlert->close(); editor->setFocus(); }, @@ -2177,7 +2177,7 @@ void App::createDocManyLangsAlert( UICodeEditor* editor ) { btn->setLayoutMarginRight( PixelDensity::dpToPx( 8 ) ); btn->onClick( [this, editor, lang, docAlert, ext]( auto ) { editor->setSyntaxDefinition( *lang ); - editor->disableReportSizeChangeToChilds(); + editor->disableReportSizeChangeToChildren(); docAlert->close(); editor->setFocus(); mConfig.languagesExtensions.priorities[ext] = lang->getLSPName(); @@ -2190,7 +2190,7 @@ void App::createDocManyLangsAlert( UICodeEditor* editor ) { docAlert->runOnMainThread( [docAlert, editor] { - editor->disableReportSizeChangeToChilds(); + editor->disableReportSizeChangeToChildren(); docAlert->close(); editor->setFocus(); }, @@ -2508,7 +2508,7 @@ void App::onCodeEditorCreated( UICodeEditor* editor, TextDocument& doc ) { } } ); - editor->on( Event::OnDocumentDirtyOnFileSysten, [this, editor]( const Event* event ) { + editor->on( Event::OnDocumentDirtyOnFileSystem, [this, editor]( const Event* event ) { const DocEvent* docEvent = static_cast( event ); FileInfo file( docEvent->getDoc()->getFileInfo().getFilepath() ); TextDocument* doc = docEvent->getDoc(); @@ -2517,7 +2517,7 @@ void App::onCodeEditorCreated( UICodeEditor* editor, TextDocument& doc ) { if ( !mConfig.editor.autoReloadOnDiskChange || doc->isDirty() ) { editor->runOnMainThread( [this, editor]() { createDocDirtyAlert( editor ); } ); } else { - auto hash = String::hash( "OnDocumentDirtyOnFileSysten-" + + auto hash = String::hash( "OnDocumentDirtyOnFileSystem-" + docEvent->getDoc()->getFilePath() ); editor->removeActionsByTag( hash ); editor->runOnMainThread( @@ -3795,7 +3795,7 @@ void App::init( const LogLevel& logLevel, std::string file, const Float& pidelDe if ( mConfig.windowState.position != Vector2i( -1, -1 ) && mConfig.windowState.displayIndex < displayManager->getDisplayCount() ) { - // 1 px offset to avoid a bug in SDL2 2.28 when maximazing windows + // 1 px offset to avoid a bug in SDL2 2.28 when maximizing windows mWindow->setPosition( mConfig.windowState.position.x + ( mConfig.windowState.maximized ? -1 : 0 ), mConfig.windowState.position.y ); @@ -4256,7 +4256,7 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) { { 'f', "file" } ); args::ValueFlag folder( parser, "folder", "The folder path to open", { "folder" } ); - args::ValueFlag pixelDenstiyConf( parser, "pixel-density", + args::ValueFlag pixelDensityConf( parser, "pixel-density", "Set default application pixel density", { 'd', "pixel-density" } ); args::ValueFlag prefersColorScheme( @@ -4359,9 +4359,9 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) { IOStreamFile sfile( convertLangPath.Get() ); if ( !sfile.isOpen() ) return EXIT_FAILURE; - std::vector adedLangs; - if ( SyntaxDefinitionManager::instance()->loadFromStream( sfile, &adedLangs ) ) { - for ( const auto& lang : adedLangs ) { + std::vector addedLangs; + if ( SyntaxDefinitionManager::instance()->loadFromStream( sfile, &addedLangs ) ) { + for ( const auto& lang : addedLangs ) { const auto& def = SyntaxDefinitionManager::instance()->getByLanguageName( lang ); auto code = SyntaxDefinitionManager::toCPP( def ); if ( convertLangOutput && !convertLangOutput.Get().empty() && @@ -4392,7 +4392,7 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) { appInstance = eeNew( App, ( jobs, args ) ); appInstance->init( logLevel.Get(), folder ? folder.Get() : fileOrFolderPos.Get(), - pixelDenstiyConf ? pixelDenstiyConf.Get() : 0.f, + pixelDensityConf ? pixelDensityConf.Get() : 0.f, prefersColorScheme ? prefersColorScheme.Get() : "", terminal.Get(), fb.Get(), benchmarkMode.Get(), css.Get(), file.Get(), verbose.Get(), disableFileLogs.Get(), openClean.Get(), portable.Get(), language.Get(), diff --git a/src/tools/ecode/featureshealth.cpp b/src/tools/ecode/featureshealth.cpp index c7539d26d..2fb6b3742 100644 --- a/src/tools/ecode/featureshealth.cpp +++ b/src/tools/ecode/featureshealth.cpp @@ -508,7 +508,7 @@ void FeaturesHealth::displayHealth( PluginManager* pluginManager, UISceneNode* s HealthModel* model = static_cast( table->getModel() ); const auto& lang = model->getHealthRow( index.row() ); - healthLangInfo->childsCloseAll(); + healthLangInfo->closeAllChildren(); std::string type = lang.lsp.url.empty() ? "TextView" : String::format( "Anchor href='%s'", lang.lsp.url ); std::string l = String::format( diff --git a/src/tools/ecode/globalsearchcontroller.cpp b/src/tools/ecode/globalsearchcontroller.cpp index 5626045bf..c38a2a853 100644 --- a/src/tools/ecode/globalsearchcontroller.cpp +++ b/src/tools/ecode/globalsearchcontroller.cpp @@ -640,14 +640,14 @@ GlobalSearchBarConfig GlobalSearchController::getGlobalSearchBarConfig() const { UICheckBox* luaPatternChk = mGlobalSearchBarLayout->find( "lua_pattern" ); UICheckBox* escapeSequenceChk = mGlobalSearchBarLayout->find( "escape_sequence" ); UICheckBox* bufferOnlyModeChk = mGlobalSearchBarLayout->find( "buffer_only_mode" ); - GlobalSearchBarConfig globalSeachBarConfig; - globalSeachBarConfig.caseSensitive = caseSensitiveChk->isChecked(); - globalSeachBarConfig.regex = regexChk->isChecked(); - globalSeachBarConfig.luaPattern = luaPatternChk->isChecked(); - globalSeachBarConfig.wholeWord = wholeWordChk->isChecked(); - globalSeachBarConfig.escapeSequence = escapeSequenceChk->isChecked(); - globalSeachBarConfig.bufferOnlyMode = bufferOnlyModeChk->isChecked(); - return globalSeachBarConfig; + GlobalSearchBarConfig globalSearchBarConfig; + globalSearchBarConfig.caseSensitive = caseSensitiveChk->isChecked(); + globalSearchBarConfig.regex = regexChk->isChecked(); + globalSearchBarConfig.luaPattern = luaPatternChk->isChecked(); + globalSearchBarConfig.wholeWord = wholeWordChk->isChecked(); + globalSearchBarConfig.escapeSequence = escapeSequenceChk->isChecked(); + globalSearchBarConfig.bufferOnlyMode = bufferOnlyModeChk->isChecked(); + return globalSearchBarConfig; } void GlobalSearchController::updateGlobalSearchBar() { diff --git a/src/tools/ecode/plugins/aiassistant/chatui.cpp b/src/tools/ecode/plugins/aiassistant/chatui.cpp index 7e06e3bb4..a90526a27 100644 --- a/src/tools/ecode/plugins/aiassistant/chatui.cpp +++ b/src/tools/ecode/plugins/aiassistant/chatui.cpp @@ -423,7 +423,7 @@ LLMChatUI::LLMChatUI( PluginManager* manager ) : getKeyBindings().getCommandKeybindString( "ai-toggle-lock-chat" ) ) ->setTooltipText( i18n( "lock_chat_memory_tooltip", - "Lock a chat memory to avoid being deleted during memory clean-ups. Chat " + "Lock a chat memory to avoid being deleted during memory clean-ups.\nChat " "memory will only be able to be deleted manually in the chat history." ) ) ->setId( "ai-toggle-lock-chat" ); diff --git a/src/tools/ecode/plugins/debugger/dap/debuggerclientdap.cpp b/src/tools/ecode/plugins/debugger/dap/debuggerclientdap.cpp index 20665a73a..ef9749919 100644 --- a/src/tools/ecode/plugins/debugger/dap/debuggerclientdap.cpp +++ b/src/tools/ecode/plugins/debugger/dap/debuggerclientdap.cpp @@ -498,7 +498,7 @@ void DebuggerClientDap::processEventTerminated( const SessionId& sessionId ) { // Clean up terminated session auto session = mSessions.extract( sessionId ); - // We cannot destroy the Bus yet, since the async read from the socket might have emited + // We cannot destroy the Bus yet, since the async read from the socket might have emitted // this termination. if ( session.mapped().bus ) { session.mapped().bus->close(); diff --git a/src/tools/ecode/plugins/debugger/dap/protocol.hpp b/src/tools/ecode/plugins/debugger/dap/protocol.hpp index 63b24855c..474f8fd08 100644 --- a/src/tools/ecode/plugins/debugger/dap/protocol.hpp +++ b/src/tools/ecode/plugins/debugger/dap/protocol.hpp @@ -424,7 +424,7 @@ struct Variable { std::string value; std::optional type; /** - * @brief evaluateName Optional evaluatable name of tihs variable which can be + * @brief evaluateName Optional evaluatable name of this variable which can be * passed to the EvaluateRequest to fetch the variable's value */ std::optional evaluateName; diff --git a/src/tools/ecode/plugins/debugger/debuggerplugin.cpp b/src/tools/ecode/plugins/debugger/debuggerplugin.cpp index be3f59cfb..18b0a01f0 100644 --- a/src/tools/ecode/plugins/debugger/debuggerplugin.cpp +++ b/src/tools/ecode/plugins/debugger/debuggerplugin.cpp @@ -330,11 +330,11 @@ void DebuggerPlugin::resetExpressions() { if ( !mExpressionsHolder ) return; mExpressionsHolder->clear( true ); - std::vector childs; - childs.reserve( mExpressions.size() ); + std::vector children; + children.reserve( mExpressions.size() ); for ( const auto& expression : mExpressions ) - childs.emplace_back( std::make_shared( expression, 0 ) ); - mExpressionsHolder->addChilds( childs ); + children.emplace_back( std::make_shared( expression, 0 ) ); + mExpressionsHolder->addChildren( children ); } void DebuggerPlugin::closeProject() { @@ -2204,7 +2204,7 @@ void DebuggerPlugin::run( const std::string& debugger, ProtocolSettings&& protoc mDebugger = std::make_unique( protocolSettings, std::move( bus ) ); } else { - // Unsuported + // Unsupported } } else if ( mode == "remote" ) { auto bus = std::make_unique( con ); diff --git a/src/tools/ecode/plugins/debugger/models/variablesmodel.cpp b/src/tools/ecode/plugins/debugger/models/variablesmodel.cpp index 67d25c1c7..afaa98921 100644 --- a/src/tools/ecode/plugins/debugger/models/variablesmodel.cpp +++ b/src/tools/ecode/plugins/debugger/models/variablesmodel.cpp @@ -229,9 +229,9 @@ void VariablesHolder::addChild( ModelVariableNode::NodePtr child ) { mModel->invalidate( Model::UpdateFlag::InvalidateAllIndexes ); } -void VariablesHolder::addChilds( const std::vector& childs ) { +void VariablesHolder::addChildren( const std::vector& children ) { Lock l( mModel->resourceMutex() ); - for ( auto& child : childs ) { + for ( auto& child : children ) { mRootNode->addChild( child ); mNodeMap[child->var.variablesReference] = child; } @@ -333,7 +333,7 @@ bool VariablesHolder::resolvePath( std::vector path, DebuggerClient auto currentNode = *currentNodeOpt; if ( currentNode->getVariablesReference() > 0 ) { - const auto onVariablesRecieved = [this, uiVariables, path, currentNode, pathPos, + const auto onVariablesReceived = [this, uiVariables, path, currentNode, pathPos, client]( const int variablesReference, std::vector&& vars ) { addVariables( variablesReference, std::move( vars ) ); @@ -348,7 +348,7 @@ bool VariablesHolder::resolvePath( std::vector path, DebuggerClient }; client->variables( currentNode->getVariablesReference(), Variable::Type::Both, - onVariablesRecieved ); + onVariablesReceived ); return true; } diff --git a/src/tools/ecode/plugins/debugger/models/variablesmodel.hpp b/src/tools/ecode/plugins/debugger/models/variablesmodel.hpp index b6b4f28b5..eeab3584d 100644 --- a/src/tools/ecode/plugins/debugger/models/variablesmodel.hpp +++ b/src/tools/ecode/plugins/debugger/models/variablesmodel.hpp @@ -138,7 +138,7 @@ class VariablesHolder { void addChild( ModelVariableNode::NodePtr child ); - void addChilds( const std::vector& childs ); + void addChildren( const std::vector& children ); void upsertRootChild( Variable&& ); diff --git a/src/tools/ecode/plugins/discordRPC/sdk/ipc.cpp b/src/tools/ecode/plugins/discordRPC/sdk/ipc.cpp index 6b6aa6ada..c0442e9b6 100644 --- a/src/tools/ecode/plugins/discordRPC/sdk/ipc.cpp +++ b/src/tools/ecode/plugins/discordRPC/sdk/ipc.cpp @@ -240,7 +240,7 @@ void DiscordIPC::sendPacket( DiscordIPCOpcodes opcode, json j ) { const std::string packet = j.dump(); std::vector data; - // Add correct ammount of padding for the protocol + // Add correct amount of padding for the protocol union { uint32_t value; uint8_t bytes[4]; @@ -285,7 +285,7 @@ void DiscordIPC::sendPacket( DiscordIPCOpcodes opcode, json j ) { reconnect(); return; } else if ( bytesSent != data.size() ) { - Log::error( "dcIPC: Incorrect ammount of data written: %zu bytes sent, %zu bytes expected", + Log::error( "dcIPC: Incorrect amount of data written: %zu bytes sent, %zu bytes expected", bytesSent, data.size() ); reconnect(); return; diff --git a/src/tools/ecode/plugins/discordRPC/sdk/ipc.hpp b/src/tools/ecode/plugins/discordRPC/sdk/ipc.hpp index 394a5ac84..948b98ab2 100644 --- a/src/tools/ecode/plugins/discordRPC/sdk/ipc.hpp +++ b/src/tools/ecode/plugins/discordRPC/sdk/ipc.hpp @@ -57,7 +57,7 @@ class DiscordIPC { bool UIReady = false; bool IsReconnectScheduled = - false; // If we fail to load bofore UI initialises we call reconnect after init + false; // If we fail to load before UI initialises we call reconnect after init // Configurables std::string ClientID; diff --git a/src/tools/ecode/plugins/git/git.cpp b/src/tools/ecode/plugins/git/git.cpp index d63e40652..f57fc3eec 100644 --- a/src/tools/ecode/plugins/git/git.cpp +++ b/src/tools/ecode/plugins/git/git.cpp @@ -14,7 +14,7 @@ using namespace std::literals; namespace ecode { -static constexpr auto sNotCommitedYetHash = "0000000000000000000000000000000000000000"; +static constexpr auto sNotCommittedYetHash = "0000000000000000000000000000000000000000"; Git::Blame::Blame( const std::string& error ) : error( error ), line( 0 ) {} @@ -41,8 +41,8 @@ int Git::git( const std::string& args, const std::string& projectDir, std::strin buf.clear(); Process p; if ( !p.create( mGitPath, args, - Process::CombinedStdoutStderr | Process::Options::NoWindow | - Process::Options::EnableAsync | Process::Options::InheritEnvironment, + Process::CombinedStdoutStderr | Process::Options::NoWindow | + Process::Options::EnableAsync | Process::Options::InheritEnvironment, { { "LC_ALL", "en_US.UTF-8" } }, projectDir.empty() ? mProjectPath : projectDir ) ) { return EXIT_FAILURE; @@ -270,7 +270,7 @@ Git::Result Git::mergeBranch( const std::string& branch, bool fastForward, projectDir ); } -Git::Result Git::commit( const std::string& commitMsg, bool ammend, bool byPassCommitHook, +Git::Result Git::commit( const std::string& commitMsg, bool amend, bool byPassCommitHook, const std::string& projectDir ) { auto tmpPath = Sys::getTempPath() + ".ecode-git-commit-" + String::randString( 16 ); if ( !FileSystem::fileWrite( tmpPath, commitMsg ) ) { @@ -281,8 +281,8 @@ Git::Result Git::commit( const std::string& commitMsg, bool ammend, bool byPassC } std::string buf; std::string opts; - if ( ammend ) - opts += " --ammend"; + if ( amend ) + opts += " --amend"; if ( byPassCommitHook ) opts += " --no-verify"; @@ -786,7 +786,7 @@ Git::Blame Git::blame( const std::string& filepath, std::size_t line ) const { auto commitHash = buf.substr( 0, hashEnd ); - if ( commitHash == sNotCommitedYetHash ) + if ( commitHash == sNotCommittedYetHash ) return { "Not Committed Yet" }; auto author = getText( "author"sv ); diff --git a/src/tools/ecode/plugins/git/git.hpp b/src/tools/ecode/plugins/git/git.hpp index 96684474c..7cfa91067 100644 --- a/src/tools/ecode/plugins/git/git.hpp +++ b/src/tools/ecode/plugins/git/git.hpp @@ -279,7 +279,7 @@ class Git { Result mergeBranch( const std::string& branch, bool fastForward = false, const std::string& projectDir = "" ); - Result commit( const std::string& commitMsg, bool ammend, bool byPassCommitHook, + Result commit( const std::string& commitMsg, bool amend, bool byPassCommitHook, const std::string& projectDir = "" ); Result fetch( const std::string& projectDir = "" ); diff --git a/src/tools/ecode/plugins/git/gitplugin.cpp b/src/tools/ecode/plugins/git/gitplugin.cpp index 7d2d5f0f6..c6f9ed884 100644 --- a/src/tools/ecode/plugins/git/gitplugin.cpp +++ b/src/tools/ecode/plugins/git/gitplugin.cpp @@ -250,7 +250,7 @@ void GitPlugin::initModelStyler() { projectView->on( Event::OnModelChanged, [this]( auto ) { initModelStyler(); } ); } - mModelStylerId = projectView->getModel()->subsribeModelStyler( + mModelStylerId = projectView->getModel()->subscribeModelStyler( [this]( const ModelIndex& index, const void* data ) -> Variant { static const char* STYLE_MODIFIED = "git_highlight_style"; static const char* STYLE_NONE = "git_highlight_style_clear"; @@ -283,7 +283,7 @@ void GitPlugin::endModelStyler() { } if ( projectView->getModel() ) { - projectView->getModel()->unsubsribeModelStyler( mModelStylerId ); + projectView->getModel()->unsubscribeModelStyler( mModelStylerId ); mModelStylerId = 0; } } @@ -643,7 +643,7 @@ void GitPlugin::blame( UICodeEditor* editor ) { if ( !mGitFound ) { editor->setTooltipText( i18n( "git_not_found", - "Git binary not found.\nPlease check that git is accesible via PATH" ) ); + "Git binary not found.\nPlease check that git is accessible via PATH" ) ); return; } mThreadPool->run( [this, editor]() { @@ -833,16 +833,16 @@ void GitPlugin::commit( const std::string& repoPath ) { txtEdit->setLineWrapMode( LineWrapMode::Letter ); txtEdit->setText( mLastCommitMsg ); - UICheckBox* chkAmmend = UICheckBox::New(); - chkAmmend->setLayoutMargin( Rectf( 0, 8, 0, 0 ) ) + UICheckBox* chkAmend = UICheckBox::New(); + chkAmend->setLayoutMargin( Rectf( 0, 8, 0, 0 ) ) ->setLayoutSizePolicy( SizePolicy::WrapContent, SizePolicy::WrapContent ) ->setLayoutGravity( UI_HALIGN_LEFT | UI_VALIGN_CENTER ) ->setClipType( ClipType::None ) ->setParent( msgBox->getLayoutCont()->getFirstChild() ) - ->setId( "git-ammend" ); - chkAmmend->setText( i18n( "git_ammend", "Ammend last commit" ) ); - chkAmmend->toPosition( 2 ); - chkAmmend->setTooltipText( getUISceneNode()->getKeyBindings().getShortcutString( + ->setId( "git-amend" ); + chkAmend->setText( i18n( "git_amend", "Amend last commit" ) ); + chkAmend->toPosition( 2 ); + chkAmend->setTooltipText( getUISceneNode()->getKeyBindings().getShortcutString( { KEY_A, KeyMod::getDefaultModifier() }, true ) ); UICheckBox* chkBypassHook = UICheckBox::New(); @@ -870,9 +870,9 @@ void GitPlugin::commit( const std::string& repoPath ) { { KEY_P, KeyMod::getDefaultModifier() }, true ) ); txtEdit->getDocument().setCommand( - "commit-ammend", [chkAmmend] { chkAmmend->setChecked( !chkAmmend->isChecked() ); } ); + "commit-amend", [chkAmend] { chkAmend->setChecked( !chkAmend->isChecked() ); } ); txtEdit->getKeyBindings().addKeybind( { KEY_L, KeyMod::getDefaultModifier() }, - "commit-ammend" ); + "commit-amend" ); txtEdit->getDocument().setCommand( "commit-push", [chkPush] { chkPush->setChecked( !chkPush->isChecked() ); } ); @@ -884,21 +884,21 @@ void GitPlugin::commit( const std::string& repoPath ) { txtEdit->getKeyBindings().addKeybind( { KEY_B, KeyMod::getDefaultModifier() }, "commit-bypass-hook" ); - msgBox->on( Event::OnConfirm, [this, msgBox, chkAmmend, chkBypassHook, chkPush, + msgBox->on( Event::OnConfirm, [this, msgBox, chkAmend, chkBypassHook, chkPush, repoPath]( const Event* ) { std::string msg( msgBox->getTextEdit()->getText().toUtf8() ); if ( msg.empty() ) return; - bool ammend = chkAmmend->isChecked(); + bool amend = chkAmend->isChecked(); bool bypassHook = chkBypassHook->isChecked(); bool pushCommit = chkPush->isChecked(); msgBox->closeWindow(); runAsync( - [this, msg, ammend, bypassHook, pushCommit, repoPath]() { + [this, msg, amend, bypassHook, pushCommit, repoPath]() { std::optional branch = getBranchFromRepoPath( repoPath ); bool pushNewBranch = branch && !branch->name.empty() && branch->remote.empty(); - auto res = mGit->commit( msg, ammend, bypassHook, repoPath ); + auto res = mGit->commit( msg, amend, bypassHook, repoPath ); if ( res.success() ) { mLastCommitMsg.clear(); if ( pushCommit ) { diff --git a/src/tools/ecode/plugins/git/gitstatusmodel.cpp b/src/tools/ecode/plugins/git/gitstatusmodel.cpp index 068565ce9..0ccbd4920 100644 --- a/src/tools/ecode/plugins/git/gitstatusmodel.cpp +++ b/src/tools/ecode/plugins/git/gitstatusmodel.cpp @@ -43,7 +43,7 @@ GitStatusModel::GitStatusModel( Git::FilesStatus&& status, GitPlugin* gitPlugin } } - // Set the parents after the addreses are stable + // Set the parents after the addresses are stable for ( auto& status : mStatus ) { for ( auto& type : status.type ) { for ( auto& f : type.files ) diff --git a/src/tools/ecode/plugins/linter/linterplugin.cpp b/src/tools/ecode/plugins/linter/linterplugin.cpp index 772508bf1..6f78676e3 100644 --- a/src/tools/ecode/plugins/linter/linterplugin.cpp +++ b/src/tools/ecode/plugins/linter/linterplugin.cpp @@ -474,7 +474,7 @@ PluginRequestHandle LinterPlugin::processMessage( const PluginMessage& notificat if ( ( pos.column() >= match.range.start().column() && pos.column() <= match.range.end().column() ) || matches.size() == 1 ) { - PluginInmediateResponse msg; + PluginImmediateResponse msg; msg.type = PluginMessageType::GetErrorOrWarning; json rj; rj["text"] = match.text; @@ -516,7 +516,7 @@ PluginRequestHandle LinterPlugin::processMessage( const PluginMessage& notificat for ( const auto& match : matches ) { if ( pos.column() >= match.range.start().column() && pos.column() <= match.range.end().column() ) { - PluginInmediateResponse msg; + PluginImmediateResponse msg; msg.type = PluginMessageType::GetDiagnostics; json rj; rj["diagnostics"] = json::array( { toJson( match.diagnostic ) } ); diff --git a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp index 8a024c451..dfdbff704 100644 --- a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp +++ b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp @@ -820,7 +820,7 @@ PluginRequestHandle LSPClientPlugin::processMessage( const PluginMessage& msg ) URI uri; if ( data.contains( "uri" ) && data["uri"].is_string() ) uri = data["uri"]; - PluginInmediateResponse rmsg; + PluginImmediateResponse rmsg; rmsg.type = PluginMessageType::QueryPluginCapability; auto servers = mClientManager.getFilteredServers( [capability, uri]( LSPClientServer* server ) { @@ -1419,7 +1419,7 @@ void LSPClientPlugin::onRegister( UICodeEditor* editor ) { doc.setCommand( "lsp-refresh-semantic-highlighting", [this]( TextDocument::Client* client ) { - mClientManager.requestSymanticHighlighting( + mClientManager.requestSemanticHighlighting( static_cast( client )->getDocumentRef() ); } ); diff --git a/src/tools/ecode/plugins/lsp/lspclientserver.cpp b/src/tools/ecode/plugins/lsp/lspclientserver.cpp index d25c6c212..7c4b0e6d8 100644 --- a/src/tools/ecode/plugins/lsp/lspclientserver.cpp +++ b/src/tools/ecode/plugins/lsp/lspclientserver.cpp @@ -651,8 +651,7 @@ static std::vector parseDiagnostics( const json& result ) { static std::vector parseCodeAction( const json& result ) { std::vector ret; const auto& codeActions = result; - for ( const auto& vaction : codeActions ) { - auto& action = vaction; + for ( auto& action : codeActions ) { // entry could be Command or CodeAction if ( !action.contains( MEMBER_COMMAND ) || !action.at( MEMBER_COMMAND ).is_string() ) { // CodeAction diff --git a/src/tools/ecode/plugins/lsp/lspclientservermanager.cpp b/src/tools/ecode/plugins/lsp/lspclientservermanager.cpp index a4abc4ab1..5b8a0a950 100644 --- a/src/tools/ecode/plugins/lsp/lspclientservermanager.cpp +++ b/src/tools/ecode/plugins/lsp/lspclientservermanager.cpp @@ -240,7 +240,7 @@ bool LSPClientServerManager::isServerRunning( const LSPClientServer* server ) { return false; } -void LSPClientServerManager::requestSymanticHighlighting( std::shared_ptr doc ) { +void LSPClientServerManager::requestSemanticHighlighting( std::shared_ptr doc ) { auto* server = getOneLSPClientServer( doc ); if ( server ) { LSPDocumentClient* client = server->getLSPDocumentClient( doc.get() ); diff --git a/src/tools/ecode/plugins/lsp/lspclientservermanager.hpp b/src/tools/ecode/plugins/lsp/lspclientservermanager.hpp index ca37b5f74..7b1917a2e 100644 --- a/src/tools/ecode/plugins/lsp/lspclientservermanager.hpp +++ b/src/tools/ecode/plugins/lsp/lspclientservermanager.hpp @@ -96,7 +96,7 @@ class LSPClientServerManager { bool isServerRunning( const LSPClientServer* server ); - void requestSymanticHighlighting( std::shared_ptr doc ); + void requestSemanticHighlighting( std::shared_ptr doc ); void rangeFormatting( std::shared_ptr doc ); diff --git a/src/tools/ecode/plugins/lsp/lspprotocol.hpp b/src/tools/ecode/plugins/lsp/lspprotocol.hpp index 731693ce2..f70959b60 100644 --- a/src/tools/ecode/plugins/lsp/lspprotocol.hpp +++ b/src/tools/ecode/plugins/lsp/lspprotocol.hpp @@ -10,7 +10,7 @@ using namespace EE::UI::Doc; using namespace EE::Network; // The LSP protocol will be consumed by any plugin, and it's not exclusive to the LSP plugin -// The protocol should be taken as a reference on how to implement the comunication between plugins +// The protocol should be taken as a reference on how to implement the communication between plugins namespace ecode { diff --git a/src/tools/ecode/plugins/pluginmanager.hpp b/src/tools/ecode/plugins/pluginmanager.hpp index 015aed68c..b3a416315 100644 --- a/src/tools/ecode/plugins/pluginmanager.hpp +++ b/src/tools/ecode/plugins/pluginmanager.hpp @@ -225,7 +225,7 @@ struct PluginMessage { bool isBroadcast() const { return -1 == responseID; } }; -struct PluginInmediateResponse { +struct PluginImmediateResponse { PluginMessageType type{ PluginMessageType::Undefined }; nlohmann::json data; }; @@ -240,7 +240,7 @@ class PluginRequestHandle { PluginRequestHandle( PluginIDType id ) : mId( std::move( id ) ) {} - explicit PluginRequestHandle( PluginInmediateResponse msg ) : + explicit PluginRequestHandle( PluginImmediateResponse msg ) : mId( -2 ), mResponse( std::move( msg ) ) {} virtual const PluginIDType& id() const { return mId; } @@ -251,14 +251,14 @@ class PluginRequestHandle { bool isBroadcast() const { return mId == -1; } - const PluginInmediateResponse& getResponse() const { return mResponse; } + const PluginImmediateResponse& getResponse() const { return mResponse; } bool isResponse() const { return mId == -2 && !mResponse.data.empty(); } protected: PluginIDType mId{ 0 }; - PluginInmediateResponse - mResponse; //! Some requests can be responded inmediatly, so the message comes in the handle + PluginImmediateResponse + mResponse; //! Some requests can be responded immediately, so the message comes in the handle }; class PluginManager { diff --git a/src/tools/ecode/settingsmenu.cpp b/src/tools/ecode/settingsmenu.cpp index dab4e7aa5..954fe9e18 100644 --- a/src/tools/ecode/settingsmenu.cpp +++ b/src/tools/ecode/settingsmenu.cpp @@ -1654,7 +1654,7 @@ UIMenu* SettingsMenu::createViewMenu() { ->setActive( mApp->getConfig().editor.syncProjectTreeWithEditor ) ->setTooltipText( i18n( "sync_project_tree_tooltip", - "Syncronizes the current focused document as the selected\nfile in the " + "Synchronizes the current focused document as the selected\nfile in the " "directory tree." ) ) ->setId( "sync-project-tree" ); @@ -1682,7 +1682,7 @@ UIMenu* SettingsMenu::createViewMenu() { ->setVisible( mApp->getConfig().ui.panelPosition == PanelPosition::Right ); mViewMenu ->add( i18n( "move_panel_right_ellipsis", "Move panel to right..." ), - findIcon( "layout-right" ), getKeybind( "layout-rigth" ) ) + findIcon( "layout-right" ), getKeybind( "layout-right" ) ) ->setId( "move-panel-right" ) ->setVisible( mApp->getConfig().ui.panelPosition == PanelPosition::Left ); @@ -1820,7 +1820,7 @@ UIPopUpMenu* SettingsMenu::createToolsMenu() { findIcon( "search" ), getKeybind( "show-open-documents" ) ) ->setId( "show-open-documents" ); mToolsMenu - ->add( i18n( "workspace_symbol_find_ellipsis", "Search Worskspace Symbol..." ), + ->add( i18n( "workspace_symbol_find_ellipsis", "Search Workspace Symbol..." ), findIcon( "search" ), getKeybind( "open-workspace-symbol-search" ) ) ->setId( "open-workspace-symbol-search" ); mToolsMenu diff --git a/src/tools/ecode/uibuildsettings.cpp b/src/tools/ecode/uibuildsettings.cpp index 9cb9669a1..5ffeb69ea 100644 --- a/src/tools/ecode/uibuildsettings.cpp +++ b/src/tools/ecode/uibuildsettings.cpp @@ -414,7 +414,7 @@ static const auto SETTINGS_PANEL_XML = R"xml( - + @@ -749,7 +749,7 @@ void UIBuildSettings::refreshTab() { if ( !mTab ) return; mTab->setText( - String::format( ( i18n( "build_seetings", "Build Settings" ) + ": %s" ).toUtf8().c_str(), + String::format( ( i18n( "build_settings", "Build Settings" ) + ": %s" ).toUtf8().c_str(), mBuild.mName.c_str() ) ); std::string hashName = String::toString( String::hash( mIsNew ? "new_name" : mBuild.mName ) ); mTab->setId( "build_settings_" + hashName ); diff --git a/src/tools/ecode/uibuildsettings.hpp b/src/tools/ecode/uibuildsettings.hpp index 326f561ec..122da1972 100644 --- a/src/tools/ecode/uibuildsettings.hpp +++ b/src/tools/ecode/uibuildsettings.hpp @@ -42,7 +42,7 @@ class UIBuildSettings : public UIRelativeLayout { explicit UIBuildSettings( ProjectBuild& build, ProjectBuildConfiguration& config, bool isNew, const std::function onBuildNameChange ); - void moveStepUp( size_t stepNum, bool isClea ); + void moveStepUp( size_t stepNum, bool isClean ); void moveStepDown( size_t stepNum, bool isClean ); diff --git a/src/tools/eterm/eterm.cpp b/src/tools/eterm/eterm.cpp index 8f86f3a08..337ed25fb 100644 --- a/src/tools/eterm/eterm.cpp +++ b/src/tools/eterm/eterm.cpp @@ -126,7 +126,7 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) { args::ValueFlag width( parser, "winwidth", "Window width (in dp)", { "width" }, 1280 ); args::ValueFlag height( parser, "winheight", "Window height (in dp)", { "height" }, 720 ); - args::ValueFlag pixelDenstiyConf( parser, "pixel-density", + args::ValueFlag pixelDensityConf( parser, "pixel-density", "Set default application pixel density", { 'd', "pixel-density" } ); args::Positional wd( parser, "wording-dir", "Working Directory / executable" ); @@ -200,7 +200,7 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) { win = Engine::instance()->createWindow( WindowSettings( winSize.getWidth(), winSize.getHeight(), "eterm", WindowStyle::Default, WindowBackend::Default, 32, resPath + "icon/eterm.png", - pixelDenstiyConf ? pixelDenstiyConf.Get() + pixelDensityConf ? pixelDensityConf.Get() : currentDisplay->getPixelDensity() ), ContextSettings( vsync.Get() ) ); diff --git a/src/tools/texturepacker/texturepacker.cpp b/src/tools/texturepacker/texturepacker.cpp index 029744c43..e871ea84b 100644 --- a/src/tools/texturepacker/texturepacker.cpp +++ b/src/tools/texturepacker/texturepacker.cpp @@ -47,11 +47,11 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) { args::Flag saveExtensions( parser, "save-extensions", "Save the file extensions as part of the texture regions names.", { "save-extensions" } ); - args::Flag allowChilds( - parser, "allow-childs", + args::Flag allowChildren( + parser, "allow-children", "When enabled in the case of an atlas not having enough space in the image to fit all the " "source input images it will create new child atlas images to save them.", - { "allow-childs" } ); + { "allow-children" } ); args::ValueFlag height( parser, "max-width", "Texture Atlas maximum allowed height.", { 'h', "max-height" }, 4096, args::Options::Single ); args::ValueFlag width( parser, "max-width", "Texture Atlas maximum allowed width.", @@ -140,7 +140,7 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) { if ( !FileSystem::fileExists( outputFile.Get() ) ) { TexturePacker tp( width.Get(), height.Get(), PixelDensity::toFloat( pixelDensity.Get() ), forcePow2.Get(), scalableSVG.Get(), pixelsBorder.Get(), - textureFilter.Get(), allowChilds.Get() ); + textureFilter.Get(), allowChildren.Get() ); std::cout << "Packing directory: " << texturesPathSafe << std::endl; tp.addTexturesPath( texturesPathSafe ); for ( auto& image : imagesList ) { diff --git a/src/tools/uieditor/uieditor.cpp b/src/tools/uieditor/uieditor.cpp index e34116fb5..18ae95f70 100644 --- a/src/tools/uieditor/uieditor.cpp +++ b/src/tools/uieditor/uieditor.cpp @@ -11,7 +11,7 @@ The layout files can be edited with any editor, and the layout changes can be se editor. So this is a layout preview app. The layout is updated every time the layout file is modified by the user. You'll need to save the file in your editor to see the changes. This was done in a rush for a personal project ( hence the horrendous code ), but it's quite useful and -functional. Project files are created by hand for the moment, and they shuld look like this one: +functional. Project files are created by hand for the moment, and they should look like this one: /optional/project/root/path @@ -296,7 +296,7 @@ void App::tryUpdateWatch( const std::string& file ) { } std::pair App::loadLayout( std::string file, bool updateCurrentLayout ) { - mUIContainer->getContainer()->childsCloseAll(); + mUIContainer->getContainer()->closeAllChildren(); mUISceneNode->update( Time::Zero ); Uint32 marker = String::hash( updateCurrentLayout ? file : mCurrentLayout ); @@ -850,7 +850,7 @@ void App::closeProject() { mCurrentLayout = ""; mCurrentStyleSheet = ""; - mUIContainer->getContainer()->childsCloseAll(); + mUIContainer->getContainer()->closeAllChildren(); mUISceneNode->update( Time::Zero ); mUISceneNode->setStyleSheet( CSS::StyleSheet() ); @@ -1016,7 +1016,7 @@ UIFileDialog* App::saveFileDialog( UICodeEditor* editor, bool focusOnClose ) { updateEditorState(); } else { UIMessageBox* msg = - UIMessageBox::New( UIMessageBox::OK, i18n( "coudlnt_write_the_file", + UIMessageBox::New( UIMessageBox::OK, i18n( "couldnt_write_the_file", "Couldn't write the file." ) ); msg->setTitle( "Error" ); msg->show();