diff --git a/.ecode/project_build.json b/.ecode/project_build.json index 8be878019..507d60d73 100644 --- a/.ecode/project_build.json +++ b/.ecode/project_build.json @@ -169,7 +169,7 @@ "eepp-linux": { "build": [ { - "args": "--disable-static-build --with-text-shaper --with-debug-symbols --with-mold-linker gmake", + "args": "--disable-static-build --with-text-shaper --with-debug-symbols --with-mold-linker --address-sanitizer gmake", "command": "premake4", "working_dir": "${project_root}" }, @@ -300,6 +300,12 @@ "command": "${project_root}/bin/eepp-fonts-debug", "name": "eepp-fonts-debug", "working_dir": "${project_root}/bin" + }, + { + "args": "", + "command": "${project_root}/bin/eterm-debug", + "name": "eterm-debug", + "working_dir": "${project_root}/bin" } ], "var": { diff --git a/README.md b/README.md index efae6bd71..a522134db 100644 --- a/README.md +++ b/README.md @@ -448,7 +448,7 @@ Then the project files should be found in `make/windows/`. A complete solution and all the project will be available. Having installed everything, you'll be able to build the *Visual Studio* solution as any other project. -Using the commnad line argument `--windows-vc-build` will download the SDL2 dependency automatically +Using the command line argument `--windows-vc-build` will download the SDL2 dependency automatically and add the paths to the build process to link against it without the need to download manually any external dependency. @@ -578,7 +578,7 @@ click in the plus icon (+), then go to _Add Other..._ and locate and select the This script can be used to build the SDL2 and eepp as two fat static libraries with arm64 and x86_64 architectures in it (arm64 for iPhone/iPad and x86_64 for the simulators). To generate a release build pass `config=release` as a parameter -fo the script (`sh compile-all.sh config=release`). The built files will be +for the script (`sh compile-all.sh config=release`). The built files will be located in `libs/ios/`, as `libSDL2.a` and `libeepp.a` (or `libeepp-debug.a` for debug build). This two files can be integrated in your project. @@ -587,12 +587,12 @@ debug build). This two files can be integrated in your project. You will first need to [download and install emscripten](https://emscripten.org/docs/getting_started/downloads.html). Then there's a script for building the **emscripten** project in `projects/emscripten/make.sh`. Before running this script remember to set the -emsdk enviroment, it should be something like: `source /path/to/emsdk/emsdk_env.sh`. +emsdk environment, it should be something like: `source /path/to/emsdk/emsdk_env.sh`. That should be enough in **GNU/Linux** or **macOS** ( only tested this on GNU/Linux ). ## How to run the demos and tools? -All the binaries are located at the `bin` directory after built. The binaries requiere two files: +All the binaries are located at the `bin` directory after built. The binaries require two files: the eepp library and the SDL2 library. The eepp library will be located in `libs/{OS}/`. The build script will try to symlink the eepp library into `bin`, if that fails it should be copied or symlinked manually. Regarding the SDL2 library is not provided in the repository, so in order to run @@ -639,7 +639,7 @@ course of the support+community that you can get from *Godot* or *cocos2d-x* to mention a couple. The main idea of this library is to focus on a better general approach to -develop heavily UI based apps ands games than the other options, with cleaner +develop heavily UI based apps and games than the other options, with cleaner code and implementation. The main reason I developed the library is for _fun_ and to _learn_ new diff --git a/bin/assets/plugins/lspclient.json b/bin/assets/plugins/lspclient.json index d86d8238b..2cd99f346 100644 --- a/bin/assets/plugins/lspclient.json +++ b/bin/assets/plugins/lspclient.json @@ -401,9 +401,9 @@ }, { "language": "markdown", - "name": "md-lsp", - "url": "https://github.com/matkrin/md-lsp", - "command": "md-lsp", + "name": "marksman", + "url": "https://github.com/artempyanykh/marksman", + "command": "marksman", "file_patterns": ["%.md$"], "rootIndicationFileNames": [".git"] }, diff --git a/docs/articles/cssspecification.md b/docs/articles/cssspecification.md index 55e863eba..c7ee4854e 100644 --- a/docs/articles/cssspecification.md +++ b/docs/articles/cssspecification.md @@ -162,7 +162,7 @@ properties. * is similar to (but not equivalent, since specificity of inline CSS is higher): * `` * CSS standard properties directly linked to the Mozilla docs are fully supported, otherwise a clarification will appear. -* _Applicable to_ will link to the EE::UI::UIWidget that can use that property, and betweeen parenthesis is the CSS element name. +* _Applicable to_ will link to the EE::UI::UIWidget that can use that property, and between parenthesis is the CSS element name. --- @@ -174,13 +174,13 @@ Read [animation-delay](https://developer.mozilla.org/en-US/docs/Web/CSS/animatio ### animation-direction -Read [animation-direction](https://developer.mozilla.org/en-US/docs/Web/CSS/animation-direction) documenation. +Read [animation-direction](https://developer.mozilla.org/en-US/docs/Web/CSS/animation-direction) documentation. --- ### animation-duration -Read [animation-duration](https://developer.mozilla.org/en-US/docs/Web/CSS/animation-duration) documenation. +Read [animation-duration](https://developer.mozilla.org/en-US/docs/Web/CSS/animation-duration) documentation. --- @@ -582,7 +582,7 @@ Sets the amount of drag that is needed to start dragging an element. Sets the foreground color to highlight the current dragged element that its is hovering an element that accepts a drop of the dragged element. -* Applicatable to: EE::UI::UITabWidget (TabWidget), EE::UI::UIRoot (:root) +* Applicable to: EE::UI::UITabWidget (TabWidget), EE::UI::UIRoot (:root) * Data Type: [color](#color-data-type) * Default value: `#FFFFFF20` @@ -673,7 +673,7 @@ Multiple flags can be set, flags are separated by `|`. * `clip`: Enables clipping of the element box. * `multiselect`: Enables multiple selection on elements that support selection. EE::UI::UIListBox (ListBox) for the moment. * `autopadding`: Enables the element to calculate the padding based on the skin size. - * `reportsizechangetochilds`: When enabled the element will emmit a event (`OnParentSizeChange`) to its childs reporting the size change of the parent. + * `reportsizechangetochilds`: When enabled the element will emit a event (`OnParentSizeChange`) to its children reporting the size change of the parent. * Default value: _No value_ --- @@ -759,8 +759,8 @@ gravity: center_horizontal|bottom; ### gravity-owner -Widgets elements can inform that own childs position using a special flag on its implementation -(UI_OWNS_CHILDS_POSITION). Sometimes some layouts may need to override the parent behavior that uses +Widgets elements can inform that own children position using a special flag on its implementation +(UI_OWNS_CHILDREN_POSITION). Sometimes some layouts may need to override the parent behavior that uses that flag. This flag will let the layout manage his gravity against its parent in all cases. * Applicable to: Any layout element. @@ -964,7 +964,7 @@ in which these items are displayed/sorted inside the button. ### layout-gravity -The layout gravity defines how the element gravitates againts its parent (when possible). Gravity +The layout gravity defines how the element gravitates against its parent (when possible). Gravity specifies how a component should be placed in its group of cells. Must be one or more (separated by `|`) of the _value list_ values. This behaves as the [android:layout_gravity](https://developer.android.com/reference/android/widget/LinearLayout.LayoutParams#attr_android:layout_gravity) XML attribute (for those who are familiar with). @@ -987,7 +987,7 @@ XML attribute (for those who are familiar with). ### layout-height Specifies the basic height of the element. This is a required attribute for any element inside of a -containing layout element that doesn't use any fixed size for its childs (ej: EE::UI::UILinearLayout, +containing layout element that doesn't use any fixed size for its children (ej: EE::UI::UILinearLayout, EE::UI::UIRelativeLayout). Its value may be a length/dimension (such as `12dp`) for a constant height or one of the special constants. @@ -1007,7 +1007,7 @@ or one of the special constants. Positions the top edge of this element below the given anchor element ID. Accommodates top margin of this element and bottom margin of anchor view. -* Applicatable to: Any child of a EE::UI::UIRelativeLayout (RelativeLayout) +* Applicable to: Any child of a EE::UI::UIRelativeLayout (RelativeLayout) * Data Type: [string](#string-data-type) (anchor element ID) * Default value: _No value_ * Aliases: `layout_to_bottom_of` @@ -1019,7 +1019,7 @@ Accommodates top margin of this element and bottom margin of anchor view. Positions the right edge of this element to the left of the given anchor element ID. Accommodates right margin of this element and left margin of anchor element. -* Applicatable to: Any child of a EE::UI::UIRelativeLayout (RelativeLayout) +* Applicable to: Any child of a EE::UI::UIRelativeLayout (RelativeLayout) * Data Type: [string](#string-data-type) (anchor element ID) * Default value: _No value_ * Aliases: `layout_to_left_of` @@ -1031,7 +1031,7 @@ Accommodates right margin of this element and left margin of anchor element. Positions the left edge of this element to the right of the given anchor element ID. Accommodates left margin of this element and right margin of anchor element. -* Applicatable to: Any child of a EE::UI::UIRelativeLayout (RelativeLayout) +* Applicable to: Any child of a EE::UI::UIRelativeLayout (RelativeLayout) * Data Type: [string](#string-data-type) (anchor element ID) * Default value: _No value_ * Aliases: `layout_to_right_of` @@ -1043,7 +1043,7 @@ left margin of this element and right margin of anchor element. Positions the bottom edge of this element above the given anchor element ID. Accommodates bottom margin of this element and top margin of anchor view. -* Applicatable to: Any child of a EE::UI::UIRelativeLayout (RelativeLayout) +* Applicable to: Any child of a EE::UI::UIRelativeLayout (RelativeLayout) * Data Type: [string](#string-data-type) (anchor element ID) * Default value: _No value_ * Aliases: `layout_to_top_of` @@ -1077,7 +1077,7 @@ layout weight. ### layout-width Specifies the basic width of the element. This is a required attribute for any element inside of a -containing layout element that doesn't use any fixed size for its childs (ej: EE::UI::UILinearLayout, +containing layout element that doesn't use any fixed size for its children (ej: EE::UI::UILinearLayout, EE::UI::UIRelativeLayout). Its value may be a length/dimension (such as `12dp`) for a constant width or one of the special constants. @@ -1264,11 +1264,11 @@ Read [min-height](https://developer.mozilla.org/en-US/docs/Web/CSS/min-height) d ### min-icon-size Sets the minimum size of the icon inside a push button (or any widget that extends from it, for -example a menu item or a tab). It's usually required for the EE::UI::UIMenu (Menu) sice the icon +example a menu item or a tab). It's usually required for the EE::UI::UIMenu (Menu) since the icon box must have a size if the menu contains items with icons and others without, otherwise the menu items will be misaligned. -* Applicatable to: EE::UI::UIPushButton (PushButton), EE::UI::UIMenuItem (Menu::item), +* Applicable to: EE::UI::UIPushButton (PushButton), EE::UI::UIMenuItem (Menu::item), EE::UI::UITab (Tab), EE::UI::UISelectButton (SelectButton), EE::UI::UIMenuCheckBox (Menu::checkbox), EE::UI::UIMenuSubMenu (Menu::SubMenu) * Data Type: [vector2-length](#vector2-length-data-type) @@ -1427,7 +1427,7 @@ parent window. Sets the current progress of any type of progress bar or loader. -* Applicable to: EE::UI::UIProgresBar (ProgressBar), EE::UI::UILoader (Loader) +* Applicable to: EE::UI::UIProgressBar (ProgressBar), EE::UI::UILoader (Loader) * Data Type: [number](#number-data-type) * Default value: `0` @@ -1619,8 +1619,8 @@ Sets a method to scale the image inside an element. * Applicable to: EE::UI::UIImage (Image), EE::UI::UITextureRegion (TextureRegion) * Data Type: [string-list](#string-list-data-type) * Value List: - * `fit-inside`: Fits the image inside the element mantaining its ratio. - * `expand`: Expands the image to cover the whole element without mantaining its ratio. + * `fit-inside`: Fits the image inside the element maintaining its ratio. + * `expand`: Expands the image to cover the whole element without maintaining its ratio. * `none`: Keeps the image as it is. --- @@ -1688,7 +1688,7 @@ Selects an item inside an element containing a list of items from its item text. ### selection-back-color -Sets the text selection background color on a text element that suports text selection. +Sets the text selection background color on a text element that supports text selection. * Applicable to: EE::UI::UITextView (TextView) and any element that holds inside or extends from a TextView. EE::UI::UICheckBox (CheckBox), EE::UI::UIRadioButton (RadioButton), EE::UI::UITextInput @@ -1701,7 +1701,7 @@ Sets the text selection background color on a text element that suports text sel ### selection-color -Sets the text selection color on a text element that suports text selection. +Sets the text selection color on a text element that supports text selection. * Applicable to: EE::UI::UITextView (TextView) and any element that holds inside text or extends from a TextView. EE::UI::UICheckBox (CheckBox), EE::UI::UIRadioButton (RadioButton), EE::UI::UITextInput @@ -1759,7 +1759,7 @@ attached to the splitter. ### splitter-partition -Sets the space ocuppied by the first view contained by the splitter. +Sets the space occupied by the first view contained by the splitter. * Applicable to: EE::UI::UISplitter (Splitter) * Data Type: [length-percentage](#length-percentage-data-type) @@ -1799,7 +1799,7 @@ Enables/disables manually rearraging the tabs in the tab bar. ### tabbar-allow-drag-and-drop-tabs -Enables/disables the hability to move any tab from a TabWidget to another. +Enables/disables the ability to move any tab from a TabWidget to another. * Applicable to: EE::UI::UITabWidget (TabWidget) * Data Type: [boolean](#boolean-data-type) @@ -2201,10 +2201,10 @@ Multiple values are separated with a `|` (as a logical or). * `minimize`: Adds a minimize button to the titlebar. * `draggable`: Makes the window background draggable. * `shadow`: The window will project a shadow. - * `modal`: Makes the window modal (blocks interacting any element ouside the window). + * `modal`: Makes the window modal (blocks interacting any element outside the window). * `undecorated`: Creates an undecorated window (no borders and titlebar). * `resizeable`: Makes the window resizeable. - * `shareopacity`: Childs will inherit the window opacity (otherwise if you change the opacity of the window will only affect its borders, background and titlebar). + * `shareopacity`: Children will inherit the window opacity (otherwise if you change the opacity of the window will only affect its borders, background and titlebar). * `buttonactions`: Implements the window minimize, maximize and close buttons default actions. This means that close button click will close, minimize will hide (but not close) and maximize will maximize. * `framebuffer`: Creates the window on its own frame buffer. * `colorbuffer`: Enables the color buffer to the frame buffer (if active). @@ -2615,7 +2615,7 @@ Read [length](https://developer.mozilla.org/en-US/docs/Web/CSS/length) documenta **Differences with documentation:** -* Supported lenghts: `em`, `rem`, `pt`, `pc`, `in`, `cm`, `mm`, `vw`, `vh`, `vmin`, `vmax`. +* Supported lengths: `em`, `rem`, `pt`, `pc`, `in`, `cm`, `mm`, `vw`, `vh`, `vmin`, `vmax`. * Also adds: `dp` as [Device-independent pixel](https://en.wikipedia.org/wiki/Device-independent_pixel). Plus `dpr` (dp rounded), `dprd` (dp rounded down) and `dpru` (dp rounded up). @@ -2655,7 +2655,7 @@ and http/s resources. Valid resources path: ```CSS -file://assets/icon/ee.png; /** relative path to the current working diretory */ +file://assets/icon/ee.png; /** relative path to the current working directory */ "file://assets/icon/ee.png"; https://raw.githubusercontent.com/SpartanJ/eepp/develop/bin/assets/icon/ee.png; "https://raw.githubusercontent.com/SpartanJ/eepp/develop/bin/assets/icon/ee.png"; @@ -2668,13 +2668,13 @@ url(data:image/format,url-encoded-data); @texture/image_name_already_in_texture_factory; @textureregion/region_name_already_in_any_texture_atlas; @sprite/sprite_name_already_in_any_texture_atlas; /* sprite pattern name **/ -@drawable/drawable_name_already_in_any_drawable_manager; /* drawable managers are any holder of image resources. This includes: texture atlases, textures, nine patchs. */ +@drawable/drawable_name_already_in_any_drawable_manager; /* drawable managers are any holder of image resources. This includes: texture atlases, textures, nine patches. */ @9p/nine_patch_resource_name_already_in_the_nine_path_manager; drawable_resource_name; /** same as doing: @drawable/drawable_resource_name */ linear-gradient(from_color, to_color); linear-gradient(direction, from_color, to_color); /** valid directions are (without quotes): "to bottom", "to left", "to right", "to top". */ circle(radius, color, type); /** type (optional) can be (without quotes): "fill" or "solid" (filled), or "line" (lined). */ -rectangle(type, color, rotation, radius); /** type (optional) can be (without quotes): "fill" or "solid" (filled), or "line" (lined). rotation (optional) is a number in degress: "0º" (without quotes). radius (optional), must be the last parameter. */ +rectangle(type, color, rotation, radius); /** type (optional) can be (without quotes): "fill" or "solid" (filled), or "line" (lined). rotation (optional) is a number in degrees: "0º" (without quotes). radius (optional), must be the last parameter. */ triangle(type, color, "point_1.x point1.y, point_2.x point2.y, point_3.x point3.y", lineWidth) /** type can be (without quotes): "fill" or "solid" (filled), or "line" (lined). lineWidth (optional, default 1dp): the length or width of the lines when type is "fill"- */ poly(type, color, "point_1.x point1.y, point_2.x point2.y, ...", lineWidth) /** polygon. type (optional) can be (without quotes): "fill" or "solid" (filled), or "line" (lined). lineWidth (optional, default 1dp): the length or width of the lines when type is "fill"- */ icon(name, size) /** icons usually come from font glyphs, size is the font glyph size. For example: icon("quit", 24dp) */ diff --git a/include/eepp/graphics/packerhelper.hpp b/include/eepp/graphics/packerhelper.hpp index 97b2bd0c8..8868be394 100644 --- a/include/eepp/graphics/packerhelper.hpp +++ b/include/eepp/graphics/packerhelper.hpp @@ -28,7 +28,7 @@ struct sTextureRegionHdr { Uint32 PixelDensity; }; -#define HDR_TEXTUREREGION_FLAG_FLIPED ( 1 << 0 ) +#define HDR_TEXTUREREGION_FLAG_FLIPPED ( 1 << 0 ) struct sTextureHdr { char Name[HDR_NAME_SIZE]; diff --git a/include/eepp/graphics/renderer/renderer.hpp b/include/eepp/graphics/renderer/renderer.hpp index 8851c0bf1..ec89ebde5 100644 --- a/include/eepp/graphics/renderer/renderer.hpp +++ b/include/eepp/graphics/renderer/renderer.hpp @@ -243,7 +243,7 @@ class EE_API Renderer { const bool& quadsSupported() const; - const int& quadVertexs() const; + const int& quadVertex() const; ClippingMask* getClippingMask() const; @@ -292,7 +292,7 @@ class EE_API Renderer { Uint32 mExtensions; Uint32 mStateFlags; bool mQuadsSupported; - int mQuadVertexs; + int mQuadVertex; float mLineWidth; unsigned int mCurVAO; diff --git a/include/eepp/graphics/texture.hpp b/include/eepp/graphics/texture.hpp index 1c2be6dcd..c40870e33 100644 --- a/include/eepp/graphics/texture.hpp +++ b/include/eepp/graphics/texture.hpp @@ -167,11 +167,11 @@ class EE_API Texture : public DrawableResource, public Image, private NonCopyabl /** Unload the Texture from Memory */ void deleteTexture(); - /** Set if the Texture is Grabed */ - void setGrabed( const bool& isGrabed ); + /** Set if the Texture is Grabbed */ + void setGrabbed( const bool& isGrabbed ); - /** @return If the texture is Grabed */ - bool isGrabed() const; + /** @return If the texture is Grabbed */ + bool isGrabbed() const; /** @return If the texture was compressed on load (DXT compression) */ bool isCompressed() const; @@ -206,7 +206,8 @@ class EE_API Texture : public DrawableResource, public Image, private NonCopyabl */ void draw( const Float& x, const Float& y, const Float& Angle = 0, const Vector2f& scale = Vector2f::One, const Color& color = Color::White, - const BlendMode& Blend = BlendMode::Alpha(), const RenderMode& Effect = RENDER_NORMAL, + const BlendMode& Blend = BlendMode::Alpha(), + const RenderMode& Effect = RENDER_NORMAL, OriginPoint Center = OriginPoint( OriginPoint::OriginCenter ), const Rect& texSector = Rect( 0, 0, 0, 0 ) ); @@ -235,7 +236,8 @@ class EE_API Texture : public DrawableResource, public Image, private NonCopyabl const Color& Color1 = Color( 255, 255, 255, 255 ), const Color& Color2 = Color( 255, 255, 255, 255 ), const Color& Color3 = Color( 255, 255, 255, 255 ), - const BlendMode& Blend = BlendMode::Alpha(), const RenderMode& Effect = RENDER_NORMAL, + const BlendMode& Blend = BlendMode::Alpha(), + const RenderMode& Effect = RENDER_NORMAL, OriginPoint Center = OriginPoint( OriginPoint::OriginCenter ), const Rect& texSector = Rect( 0, 0, 0, 0 ) ); @@ -272,7 +274,8 @@ class EE_API Texture : public DrawableResource, public Image, private NonCopyabl const Color& Color1 = Color( 255, 255, 255, 255 ), const Color& Color2 = Color( 255, 255, 255, 255 ), const Color& Color3 = Color( 255, 255, 255, 255 ), - const BlendMode& Blend = BlendMode::Alpha(), Rect texSector = Rect( 0, 0, 0, 0 ) ); + const BlendMode& Blend = BlendMode::Alpha(), + Rect texSector = Rect( 0, 0, 0, 0 ) ); Sizef getSize(); @@ -324,7 +327,7 @@ class EE_API Texture : public DrawableResource, public Image, private NonCopyabl TEX_FLAG_MODIFIED = ( 1 << 1 ), TEX_FLAG_COMPRESSED = ( 1 << 2 ), TEX_FLAG_LOCKED = ( 1 << 3 ), - TEX_FLAG_GRABED = ( 1 << 4 ) + TEX_FLAG_GRABBED = ( 1 << 4 ) }; friend class TextureFactory; diff --git a/include/eepp/graphics/texturepacker.hpp b/include/eepp/graphics/texturepacker.hpp index c8414cd0d..8f15a7470 100644 --- a/include/eepp/graphics/texturepacker.hpp +++ b/include/eepp/graphics/texturepacker.hpp @@ -60,11 +60,11 @@ class EE_API TexturePacker { *power of two texture. * @param scalableSVG True if SVG images are scaled to the packer PixelDensity * @param pixelBorder Indicates how many pixels will be added to separate one image to another - *in the texture atlas. Usefull to avoid artifacts when rendered scaled TextureRegions. Use at + *in the texture atlas. Useful to avoid artifacts when rendered scaled TextureRegions. Use at *least 1 pixel to separate images if you will scale any TextureRegion. - * @param allowChilds When enabled if the atlas does not have enough space left in the image to + * @param allowChildren When enabled if the atlas does not have enough space left in the image to *put more resources it will create a new image atlas and add the rest of the images in that - *images, repeating this process recursivelly until using all source images. + *images, repeating this process recursively until using all source images. * @param allowFlipping Indicates if the images can be flipped inside the texture atlas. This *is not compatible with eepp ( since it can't flip the textures back to the original *orientation ). So avoid it for eepp. @@ -73,7 +73,7 @@ class EE_API TexturePacker { const Float& pixelDensity = 1, const bool& forcePowOfTwo = true, const bool& scalableSVG = false, const Uint32& pixelBorder = 2, const Texture::Filter& textureFilter = Texture::Filter::Linear, - const bool& allowChilds = false, const bool& allowFlipping = false ); + const bool& allowChildren = false, const bool& allowFlipping = false ); /** Creates a new texture packer ( you will need to call SetOptions before adding any texture or * image ). */ @@ -90,11 +90,11 @@ class EE_API TexturePacker { *power of two texture. * @param scalableSVG True if SVG images are scaled to the packer PixelDensity * @param pixelBorder Indicates how many pixels will be added to separate one image to another - *in the texture atlas. Usefull to avoid artifacts when rendered scaled TextureRegions. Use at + *in the texture atlas. Useful to avoid artifacts when rendered scaled TextureRegions. Use at *least 1 pixel to separate images if you will scale any TextureRegion. - * @param allowChilds When enabled if the atlas does not have enough space left in the image to + * @param allowChildren When enabled if the atlas does not have enough space left in the image to *put more resources it will create a new image atlas and add the rest of the images in that - *images, repeating this process recursivelly until using all source images. + *images, repeating this process recursively until using all source images. * @param allowFlipping Indicates if the images can be flipped inside the texture atlas. This *is not compatible with eepp ( since it can't flip the textures back to the original *orientation ). So avoid it for eepp. @@ -103,7 +103,7 @@ class EE_API TexturePacker { const bool& forcePowOfTwo = true, const bool& scalableSVG = false, const Uint32& pixelBorder = 2, const Texture::Filter& textureFilter = Texture::Filter::Linear, - const bool& allowChilds = false, const bool& allowFlipping = false ); + const bool& allowChildren = false, const bool& allowFlipping = false ); ~TexturePacker(); @@ -155,11 +155,11 @@ class EE_API TexturePacker { *power of two texture. * @param scalableSVG True if SVG images are scaled to the packer PixelDensity * @param pixelBorder Indicates how many pixels will be added to separate one image to another - *in the texture atlas. Usefull to avoid artifacts when rendered scaled TextureRegions. Use at + *in the texture atlas. Useful to avoid artifacts when rendered scaled TextureRegions. Use at *least 1 pixel to separate images if you will scale any TextureRegion. - * @param allowChilds When enabled if the atlas does not have enough space left in the image to + * @param allowChildren When enabled if the atlas does not have enough space left in the image to *put more resources it will create a new image atlas and add the rest of the images in that - *images, repeating this process recursivelly until using all source images. + *images, repeating this process recursively until using all source images. * @param allowFlipping Indicates if the images can be flipped inside the texture atlas. This *is not compatible with eepp ( since it can't flip the textures back to the original *orientation ). So avoid it for eepp. @@ -168,7 +168,7 @@ class EE_API TexturePacker { const bool& forcePowOfTwo = true, const bool& scalableSVG = false, const Uint32& pixelBorder = 2, const Texture::Filter& textureFilter = Texture::Filter::Linear, - const bool& allowChilds = false, const bool& allowFlipping = false ); + const bool& allowChildren = false, const bool& allowFlipping = false ); /** @return The texture atlas to generate width. */ const Int32& getWidth() const; @@ -192,7 +192,7 @@ class EE_API TexturePacker { Sizei mMaxSize; bool mPacked; bool mAllowFlipping; - bool mAllowChilds; + bool mAllowChildren; TexturePacker* mChild; Int32 mStrategy; Int32 mCount; @@ -223,7 +223,7 @@ class EE_API TexturePacker { void validate(); - TexturePackerTex* getLonguestEdge(); + TexturePackerTex* getLongestEdge(); TexturePackerTex* getShortestEdge(); diff --git a/include/eepp/network/http.hpp b/include/eepp/network/http.hpp index 44b704719..52938194d 100644 --- a/include/eepp/network/http.hpp +++ b/include/eepp/network/http.hpp @@ -49,14 +49,14 @@ class EE_API Http : NonCopyable { MultipleChoices = 300, ///< The requested page can be accessed from several locations MovedPermanently = 301, ///< The requested page has permanently moved to a new location MovedTemporarily = 302, ///< The requested page has temporarily moved to a new location - NotModified = 304, ///< For conditionnal requests, means the requested page hasn't + NotModified = 304, ///< For conditional requests, means the requested page hasn't ///< changed and doesn't need to be refreshed // 4xx: client error BadRequest = 400, ///< The server couldn't understand the request (syntax error) - Unauthorized = 401, ///< The requested page needs an authentification to be accessed + Unauthorized = 401, ///< The requested page needs an authentication to be accessed Forbidden = - 403, ///< The requested page cannot be accessed at all, even with authentification + 403, ///< The requested page cannot be accessed at all, even with authentication NotFound = 404, ///< The requested page doesn't exist RangeNotSatisfiable = 407, ///< The server can't satisfy the partial GET request (with a ///< "Range" header field) @@ -236,7 +236,7 @@ class EE_API Http : NonCopyable { /** @brief Set the request method ** See the Method enumeration for a complete list of all - ** the availale methods. + ** the available methods. ** The method is Http::Request::Get by default. ** @param method Method to use for the request */ void setMethod( Method method ); @@ -292,10 +292,10 @@ class EE_API Http : NonCopyable { /** Enables/Disables follow redirects */ void setFollowRedirect( bool follow ); - /** @return The maximun number of redirects allowd if follow redirect is enabled. */ + /** @return The maximum number of redirects allowed if follow redirect is enabled. */ const unsigned int& getMaxRedirects() const; - /** Set the maximun number of redirects allowed if follow redirect is enabled. */ + /** Set the maximum number of redirects allowed if follow redirect is enabled. */ void setMaxRedirects( unsigned int maxRedirects ); /** Definition of the current progress callback @@ -370,12 +370,12 @@ class EE_API Http : NonCopyable { bool mValidateCertificate; ///< Validates the SSL certificate in case of an HTTPS request bool mValidateHostname; ///< Validates the hostname in case of an HTTPS request bool mFollowRedirect; ///< Follows redirect response codes - bool mCompressedResponse; ///< Request comrpessed response + bool mCompressedResponse; ///< Request compressed response bool mContinue; ///< Resume download mutable bool mCancel; ///< Cancel state of current request bool mVerbose{ false }; ///< Enable/Disable verbosity ProgressCallback mProgressCallback; ///< Progress callback - unsigned int mMaxRedirections; ///< Maximun number of redirections allowed + unsigned int mMaxRedirections; ///< Maximum number of redirections allowed mutable unsigned int mRedirectionCount; ///< Number of redirections followed by the request URI mProxy; ///< Proxy information }; @@ -428,7 +428,7 @@ class EE_API Http : NonCopyable { ** Warning: this function waits for the server's response and may ** not return instantly; use a thread if you don't want to block your ** application, or use a timeout to limit the time to wait. A value - ** of Time::Zero means that the client will use the system defaut timeout + ** of Time::Zero means that the client will use the system default timeout ** (which is usually pretty long). ** @param request Request to send ** @param timeout Maximum time to wait @@ -442,7 +442,7 @@ class EE_API Http : NonCopyable { ** Warning: this function waits for the server's response and may ** not return instantly; use a thread if you don't want to block your ** application, or use a timeout to limit the time to wait. A value - ** of Time::Zero means that the client will use the system defaut timeout + ** of Time::Zero means that the client will use the system default timeout ** (which is usually pretty long). ** @param request Request to send ** @param writeTo The IO stream to write the downloaded content @@ -458,7 +458,7 @@ class EE_API Http : NonCopyable { ** Warning: this function waits for the server's response and may ** not return instantly; use a thread if you don't want to block your ** application, or use a timeout to limit the time to wait. A value - ** of Time::Zero means that the client will use the system defaut timeout + ** of Time::Zero means that the client will use the system default timeout ** (which is usually pretty long). ** @param request Request to send ** @param writePath The path of the file to write the downloaded content diff --git a/include/eepp/network/tcpsocket.hpp b/include/eepp/network/tcpsocket.hpp index 0f22776e7..3e90d6a70 100644 --- a/include/eepp/network/tcpsocket.hpp +++ b/include/eepp/network/tcpsocket.hpp @@ -162,7 +162,7 @@ It ensures that your data will always be received in order and without errors (no data corrupted, lost or duplicated). When a socket is connected to a remote host, you can -retrieve informations about this host with the +retrieve information about this host with the GetRemoteAddress and GetRemotePort functions. You can also get the local port to which the socket is bound (which is automatically chosen when the socket is connected), @@ -180,7 +180,7 @@ the data that is exchanged. You can look at the Packet class to get more details about how they work. The socket is automatically disconnected when it is destroyed, -but if you want to explicitely close the connection while +but if you want to explicitly close the connection while the socket instance is still alive, you can call disconnect. Usage example: diff --git a/include/eepp/network/udpsocket.hpp b/include/eepp/network/udpsocket.hpp index 493b8e522..eb8eb0258 100644 --- a/include/eepp/network/udpsocket.hpp +++ b/include/eepp/network/udpsocket.hpp @@ -126,7 +126,7 @@ connecting once to a remote host, like TCP sockets, it can send to and receive from any host at any time. It is a datagram protocol: bounded blocks of data (datagrams) -are transfered over the network rather than a continuous +are transferred over the network rather than a continuous stream of data (TCP). Therefore, one call to send will always match one call to receive (if the datagram is not lost), with the same data that was sent. @@ -158,7 +158,7 @@ lead to a big mess when trying to recompose a packet). If the socket is bound to a port, it is automatically unbound from it when the socket is destroyed. However, -you can unbind the socket explicitely with the Unbind +you can unbind the socket explicitly with the Unbind function if necessary, to stop receiving messages or make the port available for other sockets. diff --git a/include/eepp/scene/action.hpp b/include/eepp/scene/action.hpp index 1ba10e3ac..9734ad7dc 100644 --- a/include/eepp/scene/action.hpp +++ b/include/eepp/scene/action.hpp @@ -77,7 +77,7 @@ class EE_API Action { */ void removeEventListener( const Uint32& callbackId ); - /** Manually emmit an event of type Action::ActionType. */ + /** Manually emit an event of type Action::ActionType. */ void sendEvent( const ActionType& actionType ); /** Sets the action EE::Scene::Node target. */ diff --git a/include/eepp/scene/node.hpp b/include/eepp/scene/node.hpp index d035877fd..06ee003b1 100644 --- a/include/eepp/scene/node.hpp +++ b/include/eepp/scene/node.hpp @@ -179,7 +179,7 @@ class EE_API Node : public Transformable { bool isMouseOver() const; - bool isMouseOverMeOrChilds() const; + bool isMouseOverMeOrChildren() const; bool isMeOrParentTreeVisible() const; @@ -366,7 +366,7 @@ class EE_API Node : public Transformable { Node* getParentWidget() const; - void enableReportSizeChangeToChilds(); + void enableReportSizeChangeToChildren(); void disableReportSizeChangeToChilds(); @@ -552,7 +552,7 @@ class EE_API Node : public Transformable { virtual void matrixUnset(); - virtual void drawChilds(); + virtual void drawChildren(); virtual void onChildCountChange( Node* child, const bool& removed ); diff --git a/include/eepp/system/condition.hpp b/include/eepp/system/condition.hpp index 261a50da4..85e8e26de 100644 --- a/include/eepp/system/condition.hpp +++ b/include/eepp/system/condition.hpp @@ -66,7 +66,7 @@ class EE_API Condition : NonCopyable { void unlock(); - /** Performs an assignement followed by a signal() call. + /** Performs an assignment followed by a signal() call. * The internal Condition value is updated to value() and the Condition is * signaled. Note that the Condition must be unlocked in order * to be updated, otherwise it'll block until the Condition diff --git a/include/eepp/ui/css/stylesheetstyle.hpp b/include/eepp/ui/css/stylesheetstyle.hpp index 31305cb54..8a6be260c 100644 --- a/include/eepp/ui/css/stylesheetstyle.hpp +++ b/include/eepp/ui/css/stylesheetstyle.hpp @@ -19,7 +19,7 @@ class EE_API StyleSheetStyle { const StyleSheetVariables& variables, MediaQueryList::ptr mediaQueryList ); - std::string build( bool emmitMediaQueryStart = true, bool emmitMediaQueryEnd = true ); + std::string build( bool emitMediaQueryStart = true, bool emitMediaQueryEnd = true ); const StyleSheetSelector& getSelector() const; diff --git a/include/eepp/ui/doc/foldrangeservice.hpp b/include/eepp/ui/doc/foldrangeservice.hpp index 808298e23..c68b139de 100644 --- a/include/eepp/ui/doc/foldrangeservice.hpp +++ b/include/eepp/ui/doc/foldrangeservice.hpp @@ -20,9 +20,9 @@ class FoldRangeProvider { virtual void requestFoldRange() = 0; }; -class EE_API FoldRangeServive { +class EE_API FoldRangeService { public: - FoldRangeServive( TextDocument* doc ); + FoldRangeService( TextDocument* doc ); bool canFold() const; diff --git a/include/eepp/ui/doc/textdocument.hpp b/include/eepp/ui/doc/textdocument.hpp index 5a37d9296..912802c9b 100644 --- a/include/eepp/ui/doc/textdocument.hpp +++ b/include/eepp/ui/doc/textdocument.hpp @@ -671,9 +671,9 @@ class EE_API TextDocument { void setEncoding( TextFormat::Encoding encoding ); - const FoldRangeServive& getFoldRangeService() const; + const FoldRangeService& getFoldRangeService() const; - FoldRangeServive& getFoldRangeService(); + FoldRangeService& getFoldRangeService(); std::vector getLines() const; @@ -699,7 +699,7 @@ class EE_API TextDocument { protected: friend class TextUndoStack; - friend class FoldRangeServive; + friend class FoldRangeService; EE::System::UUID mUUID; Uint64 mModificationId{ 0 }; @@ -754,7 +754,7 @@ class EE_API TextDocument { std::unique_ptr mHighlighter; Mutex mStopFlagsMutex; UnorderedMap> mStopFlags; - FoldRangeServive mFoldRangeService; + FoldRangeService mFoldRangeService; void initializeCommands(); diff --git a/include/eepp/ui/models/filesystemmodel.hpp b/include/eepp/ui/models/filesystemmodel.hpp index 979c76f99..1a7652e7f 100644 --- a/include/eepp/ui/models/filesystemmodel.hpp +++ b/include/eepp/ui/models/filesystemmodel.hpp @@ -184,7 +184,7 @@ class EE_API FileSystemModel : public Model { virtual size_t treeColumn() const { return Column::Name; } virtual size_t rowCount( const ModelIndex& = ModelIndex() ) const; virtual size_t columnCount( const ModelIndex& = ModelIndex() ) const; - virtual bool hasChilds( const ModelIndex& = ModelIndex() ) const; + virtual bool hasChildren( const ModelIndex& = ModelIndex() ) const; virtual std::string columnName( const size_t& column ) const; virtual Variant data( const ModelIndex&, ModelRole role = ModelRole::Display ) const; virtual ModelIndex parentIndex( const ModelIndex& ) const; diff --git a/include/eepp/ui/models/model.hpp b/include/eepp/ui/models/model.hpp index 75a7d9417..82281fa2a 100644 --- a/include/eepp/ui/models/model.hpp +++ b/include/eepp/ui/models/model.hpp @@ -64,7 +64,7 @@ class EE_API Model { virtual ~Model() {}; - virtual bool hasChilds( const ModelIndex& modelIndex = ModelIndex() ) const { + virtual bool hasChildren( const ModelIndex& modelIndex = ModelIndex() ) const { return rowCount( modelIndex ) > 0; } diff --git a/include/eepp/ui/tools/uicolorpicker.hpp b/include/eepp/ui/tools/uicolorpicker.hpp index 59989ca54..409757b65 100644 --- a/include/eepp/ui/tools/uicolorpicker.hpp +++ b/include/eepp/ui/tools/uicolorpicker.hpp @@ -21,7 +21,7 @@ class EE_API UIColorPicker { const ColorPickedCb& colorPickedCb = ColorPickedCb(), const Uint8& modalAlpha = 120, const Uint32& winFlags = UI_WIN_NO_DECORATION | UI_WIN_MODAL | - UI_WIN_DRAGABLE_CONTAINER | + UI_WIN_DRAGGABLE_CONTAINER | UI_WIN_FRAME_BUFFER, const Sizef& winSize = Sizef( 320, 470 ) ); diff --git a/include/eepp/ui/uicodeeditor.hpp b/include/eepp/ui/uicodeeditor.hpp index f34af8e0b..3c0ed8fee 100644 --- a/include/eepp/ui/uicodeeditor.hpp +++ b/include/eepp/ui/uicodeeditor.hpp @@ -667,7 +667,7 @@ class EE_API UICodeEditor : public UIWidget, public TextDocument::Client { const Vector2f& getFontShadowOffset() const; - void setScroll( const Vector2f& val, bool emmitEvent = true ); + void setScroll( const Vector2f& val, bool emitEvent = true ); bool getShowLineEndings() const; @@ -685,9 +685,9 @@ class EE_API UICodeEditor : public UIWidget, public TextDocument::Client { virtual bool isScrollable() const; - bool setScrollX( const Float& val, bool emmitEvent = true ); + bool setScrollX( const Float& val, bool emitEvent = true ); - bool setScrollY( const Float& val, bool emmitEvent = true ); + bool setScrollY( const Float& val, bool emitEvent = true ); Vector2f getScreenStart() const; diff --git a/include/eepp/ui/uihelper.hpp b/include/eepp/ui/uihelper.hpp index a914ab071..8413820a7 100644 --- a/include/eepp/ui/uihelper.hpp +++ b/include/eepp/ui/uihelper.hpp @@ -35,7 +35,7 @@ enum UIFlag : Uint32 { UI_TEXT_SELECTION_ENABLED = ( 1 << 19 ), UI_ATTRIBUTE_CHANGED = ( 1 << 20 ), UI_CHECKED = ( 1 << 21 ), - UI_OWNS_CHILDS_POSITION = ( 1 << 22 ), + UI_OWNS_CHILDREN_POSITION = ( 1 << 22 ), UI_DRAG_VERTICAL = ( 1 << 23 ), UI_DRAG_HORIZONTAL = ( 1 << 24 ), UI_TAB_FOCUSABLE = ( 1 << 25 ), diff --git a/include/eepp/ui/uiitemcontainer.hpp b/include/eepp/ui/uiitemcontainer.hpp index a4ee49afe..6102cadd1 100644 --- a/include/eepp/ui/uiitemcontainer.hpp +++ b/include/eepp/ui/uiitemcontainer.hpp @@ -18,7 +18,7 @@ template class UIItemContainer : public UIWidget { void update( const Time& time ); - void drawChilds(); + void drawChildren(); virtual void onChildCountChange( Node* child, const bool& removed ); @@ -53,7 +53,7 @@ template void UIItemContainer::update( const Time } } -template void UIItemContainer::drawChilds() { +template void UIItemContainer::drawChildren() { TContainer* tParent = reinterpret_cast( getParent() ); if ( tParent->mItems.size() ) { diff --git a/include/eepp/ui/uimenubar.hpp b/include/eepp/ui/uimenubar.hpp index adedfddcd..ddcdb31f3 100644 --- a/include/eepp/ui/uimenubar.hpp +++ b/include/eepp/ui/uimenubar.hpp @@ -80,7 +80,7 @@ class EE_API UIMenuBar : public UIWidget { void unselectButtons(); - void destroyMenues(); + void destroyMenus(); void autoHeight(); }; diff --git a/include/eepp/ui/uimessagebox.hpp b/include/eepp/ui/uimessagebox.hpp index 244384712..5ceb668e8 100644 --- a/include/eepp/ui/uimessagebox.hpp +++ b/include/eepp/ui/uimessagebox.hpp @@ -14,7 +14,7 @@ class UIComboBox; #define UI_MESSAGE_BOX_DEFAULT_FLAGS \ UI_WIN_CLOSE_BUTTON | UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS | UI_WIN_MODAL | \ - UI_WIN_SHARE_ALPHA_WITH_CHILDS + UI_WIN_SHARE_ALPHA_WITH_CHILDREN class EE_API UIMessageBox : public UIWindow { public: diff --git a/include/eepp/ui/uiscrollbar.hpp b/include/eepp/ui/uiscrollbar.hpp index 4f8c15ae6..5c037b2b8 100644 --- a/include/eepp/ui/uiscrollbar.hpp +++ b/include/eepp/ui/uiscrollbar.hpp @@ -31,7 +31,7 @@ class EE_API UIScrollBar : public UIWidget { virtual bool isType( const Uint32& type ) const; - virtual void setValue( Float val, const bool& emmitEvent = true ); + virtual void setValue( Float val, const bool& emitEvent = true ); const Float& getValue() const; diff --git a/include/eepp/ui/uislider.hpp b/include/eepp/ui/uislider.hpp index 49055de26..a7ad885e0 100644 --- a/include/eepp/ui/uislider.hpp +++ b/include/eepp/ui/uislider.hpp @@ -30,7 +30,7 @@ class EE_API UISlider : public UIWidget { virtual void setTheme( UITheme* Theme ); - virtual void setValue( Float val, bool emmitEvent = true ); + virtual void setValue( Float val, bool emitEvent = true ); const Float& getValue() const; diff --git a/include/eepp/ui/uitableview.hpp b/include/eepp/ui/uitableview.hpp index a48e2e62d..48c81f89b 100644 --- a/include/eepp/ui/uitableview.hpp +++ b/include/eepp/ui/uitableview.hpp @@ -15,7 +15,7 @@ class EE_API UITableView : public UIAbstractTableView { bool isType( const Uint32& type ) const; - virtual void drawChilds(); + virtual void drawChildren(); virtual Node* overFind( const Vector2f& point ); diff --git a/include/eepp/ui/uitreeview.hpp b/include/eepp/ui/uitreeview.hpp index ce4d747a3..d794d07c9 100644 --- a/include/eepp/ui/uitreeview.hpp +++ b/include/eepp/ui/uitreeview.hpp @@ -50,7 +50,7 @@ class EE_API UITreeView : public UIAbstractTableView { virtual Sizef getContentSize() const; - virtual void drawChilds(); + virtual void drawChildren(); virtual Node* overFind( const Vector2f& point ); diff --git a/include/eepp/ui/uiwindow.hpp b/include/eepp/ui/uiwindow.hpp index af926326a..f62433ebe 100644 --- a/include/eepp/ui/uiwindow.hpp +++ b/include/eepp/ui/uiwindow.hpp @@ -20,8 +20,8 @@ enum UIWindowFlags { UI_WIN_MAXIMIZE_BUTTON = ( 1 << 3 ), UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS = ( 1 << 4 ), UI_WIN_RESIZEABLE = ( 1 << 5 ), - UI_WIN_DRAGABLE_CONTAINER = ( 1 << 6 ), - UI_WIN_SHARE_ALPHA_WITH_CHILDS = ( 1 << 7 ), + UI_WIN_DRAGGABLE_CONTAINER = ( 1 << 6 ), + UI_WIN_SHARE_ALPHA_WITH_CHILDREN = ( 1 << 7 ), UI_WIN_MODAL = ( 1 << 8 ), UI_WIN_SHADOW = ( 1 << 9 ), UI_WIN_FRAME_BUFFER = ( 1 << 10 ), @@ -31,7 +31,7 @@ enum UIWindowFlags { static const Uint32 UI_WIN_DEFAULT_FLAGS = UI_WIN_CLOSE_BUTTON | UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS | UI_WIN_RESIZEABLE | - UI_WIN_SHARE_ALPHA_WITH_CHILDS; + UI_WIN_SHARE_ALPHA_WITH_CHILDREN; class EE_API UIWindow : public UIWidget { public: @@ -256,7 +256,7 @@ class EE_API UIWindow : public UIWidget { virtual Uint32 onFocusLoss(); - void fixChildsSize(); + void fixChildrenSize(); void doResize( const NodeMessage* Msg ); diff --git a/include/eepp/window/input.hpp b/include/eepp/window/input.hpp index fa39a6e5f..219febc64 100644 --- a/include/eepp/window/input.hpp +++ b/include/eepp/window/input.hpp @@ -29,7 +29,7 @@ class EE_API Input { */ virtual void waitEvent( const Time& timeout = Time::Zero ) = 0; - /** @return If the mouse and keyboard are grabed. */ + /** @return If the mouse and keyboard are grabbed. */ virtual bool grabInput() = 0; /** Grab or Ungrab the mouse and keyboard. */ @@ -182,7 +182,7 @@ class EE_API Input { /** @return The mouse position over the current view */ Vector2f getMousePosFromView( const View& View ); - /** Set the mouse speed ( only affects grabed windows ) */ + /** Set the mouse speed ( only affects grabbed windows ) */ void setMouseSpeed( const Float& Speed ); /** @return The Mouse Speed */ @@ -224,7 +224,7 @@ class EE_API Input { /** @return The joystick manager */ JoystickManager* getJoystickManager() const; - /** @return The maximun number of fingers */ + /** @return The maximum number of fingers */ Uint32 getFingerCount(); /** @return The input finger from it's index */ @@ -277,7 +277,7 @@ class EE_API Input { Uint32 mClickTrigger; Uint32 mDoubleClickTrigger; Uint32 mInputMod; - Time mDoubleClickInterval; /// Determine the double click inverval in milliseconds ( default 400 + Time mDoubleClickInterval; /// Determine the double click interval in milliseconds ( default 400 /// ms ) Uint32 mLastButtonLeftClicked; Uint32 mLastButtonRightClicked; @@ -289,7 +289,7 @@ class EE_API Input { Vector2i mMousePos; Uint32 mNumCallBacks; Float mMouseSpeed; - bool mInputGrabed; + bool mInputGrabbed; InputFinger mFingers[EE_MAX_FINGERS]; Uint64 mEventsSentId{ 0 }; Clock mLastEvent; diff --git a/include/eepp/window/platformimpl.hpp b/include/eepp/window/platformimpl.hpp index 09550a8d8..112c33744 100644 --- a/include/eepp/window/platformimpl.hpp +++ b/include/eepp/window/platformimpl.hpp @@ -64,7 +64,7 @@ class PlatformImpl { virtual void moveWindow( int left, int top ) = 0; /** Set the GL context as the current context */ - virtual void setContext( eeWindowContex Context ) = 0; + virtual void setContext( eeWindowContext Context ) = 0; /** @return The current window position */ virtual Vector2i getPosition() = 0; @@ -108,7 +108,7 @@ class PlatformImpl { /** Force to reset the state of the current seted cursor */ virtual void restoreCursor() = 0; - virtual eeWindowContex getWindowContext() = 0; + virtual eeWindowContext getWindowContext() = 0; protected: EE::Window::Window* mWindow; diff --git a/include/eepp/window/window.hpp b/include/eepp/window/window.hpp index aee93f9c0..90ba03933 100644 --- a/include/eepp/window/window.hpp +++ b/include/eepp/window/window.hpp @@ -138,7 +138,7 @@ class WindowInfo { RGB ClearColor; bool Created; bool Maximized; - eeWindowContex Context; + eeWindowContext Context; }; /** @brief DisplayMode contains a display mode available to use */ @@ -172,7 +172,7 @@ class EE_API Window { virtual Uint32 getWindowID() const = 0; - /** Toogle the screen to Fullscreen, if it's in fullscreen toogle to windowed mode. */ + /** Toggle the screen to Fullscreen, if it's in fullscreen toggle to windowed mode. */ virtual void toggleFullscreen() = 0; /** Set the window title */ @@ -211,7 +211,7 @@ class EE_API Window { /** This will attempt to show the window */ virtual void show(); - /** This will attemp to move the window over the desktop to the position */ + /** This will attempt to move the window over the desktop to the position */ virtual void setPosition( int Left, int Top ); /** @return The Current Window Position */ @@ -264,10 +264,10 @@ class EE_API Window { virtual void setGamma( Float Red, Float Green, Float Blue ) = 0; /** The the OpenGL context as the current context */ - virtual void setCurrentContext( eeWindowContex Context ); + virtual void setCurrentContext( eeWindowContext Context ); /** @return The current OpenGL context */ - virtual eeWindowContex getContext() const; + virtual eeWindowContext getContext() const; /** @return The window handler */ virtual eeWindowHandle getWindowHandler() const = 0; @@ -313,7 +313,7 @@ class EE_API Window { /** @return The size of the pixel in screen coordinates. This is the device scale factor. */ virtual Float getScale() const; - /** @return If the aplication is running returns true ( If you Init correctly the window and is + /** @return If the application is running returns true ( If you Init correctly the window and is * running ). */ bool isRunning() const; @@ -344,7 +344,7 @@ class EE_API Window { /** Set a new projection matrix */ void setProjection( const Transform& transform ); - /** Set the current Viewport ( and creates a new ortho proyection if needed ) */ + /** Set the current Viewport ( and creates a new ortho projection if needed ) */ void setViewport( const Int32& x, const Int32& y, const Uint32& Width, const Uint32& Height ); /** @return The viewport in pixels of the view */ diff --git a/include/eepp/window/windowcontext.hpp b/include/eepp/window/windowcontext.hpp index d503cf2f7..6ce87f6a0 100644 --- a/include/eepp/window/windowcontext.hpp +++ b/include/eepp/window/windowcontext.hpp @@ -20,7 +20,7 @@ namespace EE { namespace Window { #ifdef EE_GLEW_AVAILABLE #if EE_PLATFORM == EE_PLATFORM_WIN -typedef void* eeWindowContex; +typedef void* eeWindowContext; #elif defined( EE_X11_PLATFORM ) @@ -30,17 +30,17 @@ typedef struct __glXContextRec* GLXContext; typedef struct __GLXcontextRec* GLXContext; #endif -typedef GLXContext eeWindowContex; +typedef GLXContext eeWindowContext; #elif EE_PLATFORM == EE_PLATFORM_MACOS typedef struct __AGLContextRec* AGLContext; -typedef AGLContext eeWindowContex; +typedef AGLContext eeWindowContext; #endif #else -typedef unsigned int eeWindowContex; //! Fallback +typedef unsigned int eeWindowContext; //! Fallback #endif }} // namespace EE::Window diff --git a/premake4.lua b/premake4.lua index 835cc1a25..132184d1d 100644 --- a/premake4.lua +++ b/premake4.lua @@ -9,7 +9,7 @@ function newplatform(plf) iscrosscompiler = true } - -- Allow use of new platform in --platfroms + -- Allow use of new platform in --platforms table.insert(premake.option.list["platform"].allowed, { name, description }) table.insert(premake.fields.platforms.allowed, name) @@ -159,7 +159,7 @@ newoption { trigger = "with-static-backend", description = "It will try to compi newoption { trigger = "with-gles2", description = "Compile with GLES2 support" } newoption { trigger = "with-gles1", description = "Compile with GLES1 support" } newoption { trigger = "without-mojoal", description = "Compile without mojoAL as OpenAL implementation (that requires SDL2 backend). Instead it will use openal-soft." } -newoption { trigger = "use-frameworks", description = "In macOS it will try to link the external libraries from its frameworks. For example, instead of linking against SDL2 it will link agains SDL2.framework." } +newoption { trigger = "use-frameworks", description = "In macOS it will try to link the external libraries from its frameworks. For example, instead of linking against SDL2 it will link against SDL2.framework." } newoption { trigger = "with-mold-linker", description = "Tries to use the mold linker instead of the default linker of the toolchain" } newoption { trigger = "with-debug-symbols", description = "Release builds are built with debug symbols." } newoption { trigger = "thread-sanitizer", description ="Compile with ThreadSanitizer." } @@ -812,19 +812,19 @@ function set_ios_config() local err = false if nil == os.getenv("TOOLCHAINPATH") then - print("You must set TOOLCHAINPATH enviroment variable.") + print("You must set TOOLCHAINPATH environment variable.") print("\tExample: /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/") err = true end if nil == os.getenv("SYSROOTPATH") then - print("You must set SYSROOTPATH enviroment variable.") + print("You must set SYSROOTPATH environment variable.") print("\tExample: /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.1.sdk") err = true end if nil == os.getenv("IOSVERSION") then - print("You must set IOSVERSION enviroment variable.") + print("You must set IOSVERSION environment variable.") print("\tExample: 12.1") err = true end diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index 8e15237b4..aa9620f74 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/projects/linux/ee.files b/projects/linux/ee.files index a80e97b99..a1e7b33d7 100644 --- a/projects/linux/ee.files +++ b/projects/linux/ee.files @@ -1910,6 +1910,8 @@ ../../src/tools/ecode/plugins/plugincontextprovider.hpp ../../src/tools/ecode/plugins/pluginmanager.cpp ../../src/tools/ecode/plugins/pluginmanager.hpp +../../src/tools/ecode/plugins/spellchecker/spellcheckerplugin.cpp +../../src/tools/ecode/plugins/spellchecker/spellcheckerplugin.hpp ../../src/tools/ecode/plugins/xmltools/xmltoolsplugin.cpp ../../src/tools/ecode/plugins/xmltools/xmltoolsplugin.hpp ../../src/tools/ecode/projectbuild.cpp diff --git a/src/eepp/audio/mp3info.cpp b/src/eepp/audio/mp3info.cpp index 4af9bc6f8..b71d3fcd5 100644 --- a/src/eepp/audio/mp3info.cpp +++ b/src/eepp/audio/mp3info.cpp @@ -3,7 +3,7 @@ namespace EE { namespace Audio { -/* Inpired in the mp3info library */ +/* Inspired in the mp3info library */ static const int frame_size_index[] = {24000, 72000, 72000}; @@ -166,7 +166,7 @@ bool Mp3Info::getFirstHeader( long startpos ) { break; } - // If read 1MB and not 255 found, asume error + // If read 1MB and not 255 found, assume error if ( mStream.tell() >= EE_1MB ) { return false; } diff --git a/src/eepp/core/memorymanager.cpp b/src/eepp/core/memorymanager.cpp index 85976dcb5..dd6057eb7 100644 --- a/src/eepp/core/memorymanager.cpp +++ b/src/eepp/core/memorymanager.cpp @@ -35,7 +35,7 @@ static AllocatedPointerMap sMapPointers; static size_t sTotalMemoryUsage = 0; static size_t sPeakMemoryUsage = 0; static AllocatedPointer sBiggestAllocation = AllocatedPointer( NULL, "", 0, 0 ); -static Mutex sAlloMutex; +static Mutex sAllocMutex; AllocatedPointer::AllocatedPointer( void* data, const std::string& file, int line, size_t memory, bool track ) { @@ -65,7 +65,7 @@ void* MemoryManager::addPointerInPlace( void* place, const AllocatedPointer& aAl } void* MemoryManager::addPointer( const AllocatedPointer& aAllocatedPointer ) { - ConditionalLock l( sHasInit, &sAlloMutex ); + ConditionalLock l( sHasInit, &sAllocMutex ); sMapPointers.insert( AllocatedPointerMap::value_type( aAllocatedPointer.mData, aAllocatedPointer ) ); @@ -92,7 +92,7 @@ void* MemoryManager::addPointer( const AllocatedPointer& aAllocatedPointer ) { } void* MemoryManager::reallocPointer( void* data, const AllocatedPointer& aAllocatedPointer ) { - Lock l( sAlloMutex ); + Lock l( sAllocMutex ); AllocatedPointerMapIt it = sMapPointers.find( data ); @@ -132,7 +132,7 @@ void* MemoryManager::reallocPointer( void* data, const AllocatedPointer& aAlloca } bool MemoryManager::removePointer( void* data, const char* file, const size_t& line ) { - Lock l( sAlloMutex ); + Lock l( sAllocMutex ); AllocatedPointerMapIt it = sMapPointers.find( data ); diff --git a/src/eepp/graphics/arcdrawable.cpp b/src/eepp/graphics/arcdrawable.cpp index 99c37868c..5cbf6ace7 100644 --- a/src/eepp/graphics/arcdrawable.cpp +++ b/src/eepp/graphics/arcdrawable.cpp @@ -124,7 +124,7 @@ void ArcDrawable::updateVertex() { Uint32( (Float)mSegmentsCount * (Float)eeabs( arcAngleA ) / 360 ); Float startAngle = Math::radians( mArcStartAngle ); Float theta = Math::radians( arcAngleA ) / Float( segmentsCount - 1 ); - Float tangetialFactor = eetan( theta ); + Float tangentialFactor = eetan( theta ); Float radialFactor = eecos( theta ); Float x = mRadius * eecos( startAngle ); Float y = mRadius * eesin( startAngle ); @@ -136,8 +136,8 @@ void ArcDrawable::updateVertex() { Float tx = -y; Float ty = x; - x += tx * tangetialFactor; - y += ty * tangetialFactor; + x += tx * tangentialFactor; + y += ty * tangentialFactor; x *= radialFactor; y *= radialFactor; diff --git a/src/eepp/graphics/blendmode.cpp b/src/eepp/graphics/blendmode.cpp index 39944a00c..c8be819e9 100644 --- a/src/eepp/graphics/blendmode.cpp +++ b/src/eepp/graphics/blendmode.cpp @@ -83,7 +83,7 @@ std::string BlendMode::equationToString( const Equation& eq ) { case BlendMode::Equation::Add: return "Add"; case BlendMode::Equation::Subtract: - return "Substract"; + return "Subtract"; case BlendMode::Equation::ReverseSubtract: return "ReverseSubtract"; } diff --git a/src/eepp/graphics/fonttruetype.cpp b/src/eepp/graphics/fonttruetype.cpp index f88b1df01..6ea639a39 100644 --- a/src/eepp/graphics/fonttruetype.cpp +++ b/src/eepp/graphics/fonttruetype.cpp @@ -45,7 +45,7 @@ unsigned long read( FT_Stream rec, unsigned long offset, unsigned char* buffer, void close( FT_Stream ) {} -// Helper to intepret memory as a specific type +// Helper to interpret memory as a specific type template inline T reinterpret( const U& input ) { T output; std::memcpy( &output, &input, sizeof( U ) ); @@ -1229,7 +1229,7 @@ Rect FontTrueType::findGlyphRect( Page& page, unsigned int width, unsigned int h // Find the glyph's rectangle on the selected row Rect rect( row->width, row->top, width, height ); - // Update the row informations + // Update the row information row->width += width; return rect; diff --git a/src/eepp/graphics/primitives.cpp b/src/eepp/graphics/primitives.cpp index c8938591c..8003e0baf 100644 --- a/src/eepp/graphics/primitives.cpp +++ b/src/eepp/graphics/primitives.cpp @@ -151,7 +151,7 @@ void Primitives::drawArc( const Vector2f& p, const Float& radius, Uint32 segment segmentsCount = Uint32( (Float)segmentsCount * (Float)eeabs( arcAngleA ) / 360 ); Float startAngle = Math::radians( arcStartAngle ); Float theta = Math::radians( arcAngleA ) / Float( segmentsCount - 1 ); - Float tangetialFactor = eetan( theta ); + Float tangentialFactor = eetan( theta ); Float radialFactor = eecos( theta ); Float x = radius * eecos( startAngle ); Float y = radius * eesin( startAngle ); @@ -165,8 +165,8 @@ void Primitives::drawArc( const Vector2f& p, const Float& radius, Uint32 segment Float tx = -y; Float ty = x; - x += tx * tangetialFactor; - y += ty * tangetialFactor; + x += tx * tangentialFactor; + y += ty * tangentialFactor; x *= radialFactor; y *= radialFactor; diff --git a/src/eepp/graphics/renderer/renderer.cpp b/src/eepp/graphics/renderer/renderer.cpp index 79326d41f..846102a90 100644 --- a/src/eepp/graphics/renderer/renderer.cpp +++ b/src/eepp/graphics/renderer/renderer.cpp @@ -198,7 +198,7 @@ Renderer::Renderer() : mExtensions( 0 ), mStateFlags( 1 << RSF_LINE_SMOOTH ), mQuadsSupported( true ), - mQuadVertexs( 4 ), + mQuadVertex( 4 ), mLineWidth( 1 ), mCurVAO( 0 ), mClippingMask( eeNew( ClippingMask, () ) ) { @@ -707,8 +707,8 @@ void Renderer::colorMask( Uint8 red, Uint8 green, Uint8 blue, Uint8 alpha ) { glColorMask( red, green, blue, alpha ); } -const int& Renderer::quadVertexs() const { - return mQuadVertexs; +const int& Renderer::quadVertex() const { + return mQuadVertex; } ClippingMask* Renderer::getClippingMask() const { diff --git a/src/eepp/graphics/renderer/renderergl.cpp b/src/eepp/graphics/renderer/renderergl.cpp index d6dc20f99..1a8d2e04a 100644 --- a/src/eepp/graphics/renderer/renderergl.cpp +++ b/src/eepp/graphics/renderer/renderergl.cpp @@ -55,7 +55,7 @@ namespace EE { namespace Graphics { RendererGL::RendererGL() { #ifdef EE_GLES1 mQuadsSupported = false; - mQuadVertexs = 6; + mQuadVertex = 6; #endif } diff --git a/src/eepp/graphics/renderer/renderergl3.cpp b/src/eepp/graphics/renderer/renderergl3.cpp index 5f388aa1a..536f9d474 100644 --- a/src/eepp/graphics/renderer/renderergl3.cpp +++ b/src/eepp/graphics/renderer/renderergl3.cpp @@ -40,7 +40,7 @@ RendererGL3::RendererGL3() : mLoaded( false ) { #if defined( EE_GLES2 ) || defined( EE_GLES_BOTH ) mQuadsSupported = false; - mQuadVertexs = 6; + mQuadVertex = 6; #endif Renderer::enable( GL_VERTEX_PROGRAM_POINT_SIZE ); } diff --git a/src/eepp/graphics/renderer/renderergl3cp.cpp b/src/eepp/graphics/renderer/renderergl3cp.cpp index 6432fe6d9..2a65760e7 100644 --- a/src/eepp/graphics/renderer/renderergl3cp.cpp +++ b/src/eepp/graphics/renderer/renderergl3cp.cpp @@ -53,7 +53,7 @@ RendererGL3CP::RendererGL3CP() : mBiggestAlloc( 0 ), mLoaded( false ) { mQuadsSupported = false; - mQuadVertexs = 6; + mQuadVertex = 6; } RendererGL3CP::~RendererGL3CP() { diff --git a/src/eepp/graphics/renderer/renderergles2.cpp b/src/eepp/graphics/renderer/renderergles2.cpp index ad11357fd..3e97d4eb5 100644 --- a/src/eepp/graphics/renderer/renderergles2.cpp +++ b/src/eepp/graphics/renderer/renderergles2.cpp @@ -50,7 +50,7 @@ RendererGLES2::RendererGLES2() : mLoaded( false ), mCurShaderLocal( true ) { mQuadsSupported = false; - mQuadVertexs = 6; + mQuadVertex = 6; #if !defined( EE_GLES2 ) Renderer::enable( GL_VERTEX_PROGRAM_POINT_SIZE ); #endif diff --git a/src/eepp/graphics/shader.cpp b/src/eepp/graphics/shader.cpp index 1e8e87a7e..a3ebea993 100644 --- a/src/eepp/graphics/shader.cpp +++ b/src/eepp/graphics/shader.cpp @@ -263,7 +263,7 @@ bool Shader::compile() { Log::error( mCompileLog.c_str() ); Log::error( mSource.c_str() ); } else { - Log::info( "Shader %s compiled succesfully", getName().c_str() ); + Log::info( "Shader %s compiled successfully", getName().c_str() ); } #endif diff --git a/src/eepp/graphics/text.cpp b/src/eepp/graphics/text.cpp index fb3470572..e546f17c0 100644 --- a/src/eepp/graphics/text.cpp +++ b/src/eepp/graphics/text.cpp @@ -1771,7 +1771,7 @@ void Text::draw( const Float& X, const Float& Y, const Vector2f& scale, const Fl BlendMode::setMode( effect ); Uint32 alloc = numvert * sizeof( VertexCoords ); - Uint32 allocC = numvert * GLi->quadVertexs(); + Uint32 allocC = numvert * GLi->quadVertex(); if ( 0 != mFontStyleConfig.OutlineThickness ) { GLi->colorPointer( 4, GL_UNSIGNED_BYTE, 0, @@ -1862,10 +1862,10 @@ void Text::ensureGeometryUpdate() { if ( !mFontStyleConfig.Font || mString.empty() ) return; - mVertices.reserve( mString.size() * GLi->quadVertexs() ); + mVertices.reserve( mString.size() * GLi->quadVertex() ); if ( mFontStyleConfig.OutlineThickness != 0.f ) - mOutlineVertices.reserve( mString.size() * GLi->quadVertexs() ); + mOutlineVertices.reserve( mString.size() * GLi->quadVertex() ); // Compute values related to the text style bool bold = ( mFontStyleConfig.Style & Bold ) != 0; @@ -2389,8 +2389,8 @@ void Text::setFillColor( const Color& color, Uint32 from, Uint32 to ) { if ( '\n' == curChar ) { if ( underlined || strikeThrough ) { - for ( int v = 0; v < GLi->quadVertexs(); v++ ) - mColors[rpos * GLi->quadVertexs() + v] = color; + for ( int v = 0; v < GLi->quadVertex(); v++ ) + mColors[rpos * GLi->quadVertex() + v] = color; } if ( underlined ) @@ -2401,29 +2401,29 @@ void Text::setFillColor( const Color& color, Uint32 from, Uint32 to ) { } } } else { - for ( int v = 0; v < GLi->quadVertexs(); v++ ) - mColors[lpos * GLi->quadVertexs() + v] = color; + for ( int v = 0; v < GLi->quadVertex(); v++ ) + mColors[lpos * GLi->quadVertex() + v] = color; } } if ( to == s ) { if ( underlined ) { lpos++; - Uint32 pos = lpos * GLi->quadVertexs(); + Uint32 pos = lpos * GLi->quadVertex(); if ( pos < mColors.size() ) { - for ( int v = 0; v < GLi->quadVertexs(); v++ ) - mColors[lpos * GLi->quadVertexs() + v] = color; + for ( int v = 0; v < GLi->quadVertex(); v++ ) + mColors[lpos * GLi->quadVertex() + v] = color; } } if ( strikeThrough ) { lpos++; - Uint32 pos = lpos * GLi->quadVertexs(); + Uint32 pos = lpos * GLi->quadVertex(); if ( pos < mColors.size() ) { - for ( int v = 0; v < GLi->quadVertexs(); v++ ) - mColors[lpos * GLi->quadVertexs() + v] = color; + for ( int v = 0; v < GLi->quadVertex(); v++ ) + mColors[lpos * GLi->quadVertex() + v] = color; } } } @@ -2586,8 +2586,8 @@ void Text::addGlyphQuad( std::vector& vertices, Vector2f position, Uint32 Text::getTotalVertices() { bool underlined = ( mFontStyleConfig.Style & Underlined ) != 0; bool strikeThrough = ( mFontStyleConfig.Style & StrikeThrough ) != 0; - size_t sv = mString.size() * GLi->quadVertexs(); - Uint32 skiped = 0; + size_t sv = mString.size() * GLi->quadVertex(); + Uint32 skipped = 0; bool lineHasChars = false; for ( const auto& ch : mString ) { @@ -2595,27 +2595,27 @@ Uint32 Text::getTotalVertices() { if ( ' ' == ch || '\n' == ch || '\t' == ch || '\r' == ch ) { lineHasChars = false; - skiped++; + skipped++; if ( '\n' == ch ) { if ( underlined ) - skiped--; + skipped--; if ( strikeThrough ) - skiped--; + skipped--; } } } if ( lineHasChars ) { if ( underlined ) - skiped--; + skipped--; if ( strikeThrough ) - skiped--; + skipped--; } - sv -= skiped * GLi->quadVertexs(); + sv -= skipped * GLi->quadVertex(); return sv; } diff --git a/src/eepp/graphics/texture.cpp b/src/eepp/graphics/texture.cpp index ea5515473..8364f6992 100644 --- a/src/eepp/graphics/texture.cpp +++ b/src/eepp/graphics/texture.cpp @@ -476,7 +476,7 @@ void Texture::reload() { : flags; if ( ( mFlags & TEX_FLAG_COMPRESSED ) ) { - if ( isGrabed() ) + if ( isGrabbed() ) mTexture = SOIL_create_OGL_texture( reinterpret_cast( &mPixels[0] ), &width, &height, mChannels, mTexture, flags | SOIL_FLAG_COMPRESS_TO_DXT ); @@ -634,18 +634,18 @@ bool Texture::getMipmap() const { return mFlags & TEX_FLAG_MIPMAP; } -void Texture::setGrabed( const bool& isGrabed ) { - if ( mFlags & TEX_FLAG_GRABED ) { - if ( !isGrabed ) - mFlags &= ~TEX_FLAG_GRABED; +void Texture::setGrabbed( const bool& isGrabbed ) { + if ( mFlags & TEX_FLAG_GRABBED ) { + if ( !isGrabbed ) + mFlags &= ~TEX_FLAG_GRABBED; } else { - if ( isGrabed ) - mFlags |= TEX_FLAG_GRABED; + if ( isGrabbed ) + mFlags |= TEX_FLAG_GRABBED; } } -bool Texture::isGrabed() const { - return 0 != ( mFlags & TEX_FLAG_GRABED ); +bool Texture::isGrabbed() const { + return 0 != ( mFlags & TEX_FLAG_GRABBED ); } bool Texture::isCompressed() const { diff --git a/src/eepp/graphics/textureatlasloader.cpp b/src/eepp/graphics/textureatlasloader.cpp index 8db86f012..60d2083eb 100644 --- a/src/eepp/graphics/textureatlasloader.cpp +++ b/src/eepp/graphics/textureatlasloader.cpp @@ -280,7 +280,7 @@ void TextureAtlasLoader::createTextureRegions() { Vector2i( tSh->OffsetX, tSh->OffsetY ), TextureRegionName ); tTextureRegion->setPixelDensity( tSh->PixelDensity / 100.f ); - // if ( tSh->Flags & HDR_TEXTUREREGION_FLAG_FLIPED ) + // if ( tSh->Flags & HDR_TEXTUREREGION_FLAG_FLIPPED ) // Should rotate the sub texture, but.. sub texture rotation is not stored. mTextureAtlas->add( tTextureRegion ); @@ -445,9 +445,9 @@ bool TextureAtlasLoader::updateTextureAtlas( std::string TextureAtlasPath, std:: std::begin( result.digest ) ) ) { if ( Image::getInfo( path.c_str(), &x, &y, &c ) ) { // If size or channels changed, the image need update. - if ( ( !( tSh->Flags & HDR_TEXTUREREGION_FLAG_FLIPED ) && + if ( ( !( tSh->Flags & HDR_TEXTUREREGION_FLAG_FLIPPED ) && tSh->Width == x && tSh->Height == y ) || - ( ( tSh->Flags & HDR_TEXTUREREGION_FLAG_FLIPED ) && + ( ( tSh->Flags & HDR_TEXTUREREGION_FLAG_FLIPPED ) && tSh->Width == y && tSh->Height == x ) || tSh->Channels != c ) { // Only update the image with the newest one. diff --git a/src/eepp/graphics/texturefactory.cpp b/src/eepp/graphics/texturefactory.cpp index b62fc87b0..112994318 100644 --- a/src/eepp/graphics/texturefactory.cpp +++ b/src/eepp/graphics/texturefactory.cpp @@ -291,7 +291,7 @@ void TextureFactory::grabTextures() { if ( Tex && !Tex->hasLocalCopy() ) { Tex->lock(); - Tex->setGrabed( true ); + Tex->setGrabbed( true ); } } } @@ -300,10 +300,10 @@ void TextureFactory::ungrabTextures() { for ( Uint32 i = 1; i < mTextures.size(); i++ ) { Texture* Tex = getTexture( i ); - if ( NULL != Tex && Tex->isGrabed() ) { + if ( NULL != Tex && Tex->isGrabbed() ) { Tex->reload(); Tex->unlock(); - Tex->setGrabed( false ); + Tex->setGrabbed( false ); } } } diff --git a/src/eepp/graphics/texturepacker.cpp b/src/eepp/graphics/texturepacker.cpp index e766d6d66..fee75f99e 100644 --- a/src/eepp/graphics/texturepacker.cpp +++ b/src/eepp/graphics/texturepacker.cpp @@ -17,16 +17,16 @@ TexturePacker* TexturePacker::New() { TexturePacker* TexturePacker::New( const Uint32& maxWidth, const Uint32& maxHeight, const Float& pixelDensity, const bool& forcePowOfTwo, const bool& scalableSVG, const Uint32& pixelBorder, - const Texture::Filter& textureFilter, const bool& allowChilds, + const Texture::Filter& textureFilter, const bool& allowChildren, const bool& allowFlipping ) { return eeNew( TexturePacker, ( maxWidth, maxHeight, pixelDensity, forcePowOfTwo, scalableSVG, - pixelBorder, textureFilter, allowChilds, allowFlipping ) ); + pixelBorder, textureFilter, allowChildren, allowFlipping ) ); } TexturePacker::TexturePacker( const Uint32& maxWidth, const Uint32& maxHeight, const Float& pixelDensity, const bool& forcePowOfTwo, const bool& scalableSVG, const Uint32& pixelBorder, - const Texture::Filter& textureFilter, const bool& allowChilds, + const Texture::Filter& textureFilter, const bool& allowChildren, const bool& allowFlipping ) : mTotalArea( 0 ), mFreeList( NULL ), @@ -34,7 +34,7 @@ TexturePacker::TexturePacker( const Uint32& maxWidth, const Uint32& maxHeight, mHeight( 128 ), mPacked( false ), mAllowFlipping( allowFlipping ), - mAllowChilds( allowChilds ), + mAllowChildren( allowChildren ), mChild( NULL ), mStrategy( PackBig ), mCount( 0 ), @@ -48,7 +48,7 @@ TexturePacker::TexturePacker( const Uint32& maxWidth, const Uint32& maxHeight, mScalableSVG( scalableSVG ), mFormat( Image::SaveType::PNG ) { setOptions( maxWidth, maxHeight, pixelDensity, forcePowOfTwo, scalableSVG, pixelBorder, - textureFilter, allowChilds, allowFlipping ); + textureFilter, allowChildren, allowFlipping ); } TexturePacker::TexturePacker() : @@ -137,7 +137,7 @@ Uint32 TexturePacker::getAtlasNumChannels() { void TexturePacker::setOptions( const Uint32& maxWidth, const Uint32& maxHeight, const Float& pixelDensity, const bool& forcePowOfTwo, const bool& scalableSVG, const Uint32& pixelBorder, - const Texture::Filter& textureFilter, const bool& allowChilds, + const Texture::Filter& textureFilter, const bool& allowChildren, const bool& allowFlipping ) { if ( !mTextures.size() ) { // only can change the dimensions before adding any texture mMaxSize.x = maxWidth; @@ -151,7 +151,7 @@ void TexturePacker::setOptions( const Uint32& maxWidth, const Uint32& maxHeight, mForcePowOfTwo = forcePowOfTwo; mAllowFlipping = allowFlipping; - mAllowChilds = allowChilds; + mAllowChildren = allowChildren; mPixelBorder = pixelBorder; mPixelDensity = eefloor( pixelDensity * 100 ); mTextureFilter = textureFilter; @@ -215,7 +215,7 @@ void TexturePacker::validate() { #endif } -TexturePackerTex* TexturePacker::getLonguestEdge() { +TexturePackerTex* TexturePacker::getLongestEdge() { TexturePackerTex* t = NULL; std::vector::iterator it; @@ -526,7 +526,7 @@ Int32 TexturePacker::packTextures() { // over after the split. if ( PackBig == mStrategy ) { - t = getLonguestEdge(); + t = getLongestEdge(); } else if ( PackTiny == mStrategy ) { t = getShortestEdge(); } @@ -537,7 +537,7 @@ Int32 TexturePacker::packTextures() { if ( NULL == bestFit ) { if ( PackBig == mStrategy ) { - Log::debug( "TexturePacker: Chaging Strategy to Tiny. %s faults.", + Log::debug( "TexturePacker: Changing Strategy to Tiny. %s faults.", t->name().c_str() ); reset(); addBorderToTextures( -( (Int32)mPixelBorder ) ); @@ -573,7 +573,7 @@ Int32 TexturePacker::packTextures() { return packTextures(); } else { - if ( !mAllowChilds ) { + if ( !mAllowChildren ) { return 0; } } @@ -583,7 +583,7 @@ Int32 TexturePacker::packTextures() { } if ( mCount > 0 ) { - if ( mAllowChilds ) { + if ( mAllowChildren ) { Log::debug( "Creating a new image as a child. Some textures couldn't get it: %d", mCount ); createChild(); @@ -777,7 +777,7 @@ void TexturePacker::createTextureRegionsHdr( TexturePacker* Packer, memcpy( tTextureRegionHdr.Hash, &md5Result.digest[0], HDR_HASH_SIZE ); if ( tTex->flipped() ) - tTextureRegionHdr.Flags |= HDR_TEXTUREREGION_FLAG_FLIPED; + tTextureRegionHdr.Flags |= HDR_TEXTUREREGION_FLAG_FLIPPED; TextureRegions[c] = tTextureRegionHdr; diff --git a/src/eepp/graphics/vertexbuffer.cpp b/src/eepp/graphics/vertexbuffer.cpp index 241a738fa..2185baafd 100644 --- a/src/eepp/graphics/vertexbuffer.cpp +++ b/src/eepp/graphics/vertexbuffer.cpp @@ -150,7 +150,7 @@ void VertexBuffer::resizeIndices( const Uint32& size ) { } void VertexBuffer::addQuad( const Vector2f& pos, const Sizef& size, const Color& color ) { - if ( GLi->quadVertexs() == 6 ) { + if ( GLi->quadVertex() == 6 ) { addColor( color ); addColor( color ); addColor( color ); @@ -181,14 +181,14 @@ void VertexBuffer::setQuad( const Vector2u& gridPos, const Vector2f& pos, const mDrawType == PrimitiveType::PRIMITIVE_QUAD_STRIP || mDrawType == PrimitiveType::PRIMITIVE_TRIANGLES ); eeASSERT( mGridSize != Sizei::Zero ); - eeASSERT( static_cast( gridPos.x * GLi->quadVertexs() + - gridPos.y * mGridSize.x * GLi->quadVertexs() + - GLi->quadVertexs() - 1 ) < mPosArray.size() ); - eeASSERT( static_cast( gridPos.x * GLi->quadVertexs() + - gridPos.y * mGridSize.x * GLi->quadVertexs() + - GLi->quadVertexs() - 1 ) < mColorArray.size() ); - int idx = ( gridPos.x * GLi->quadVertexs() + gridPos.y * mGridSize.x * GLi->quadVertexs() ); - if ( GLi->quadVertexs() == 6 ) { + eeASSERT( static_cast( gridPos.x * GLi->quadVertex() + + gridPos.y * mGridSize.x * GLi->quadVertex() + GLi->quadVertex() - + 1 ) < mPosArray.size() ); + eeASSERT( static_cast( gridPos.x * GLi->quadVertex() + + gridPos.y * mGridSize.x * GLi->quadVertex() + GLi->quadVertex() - + 1 ) < mColorArray.size() ); + int idx = ( gridPos.x * GLi->quadVertex() + gridPos.y * mGridSize.x * GLi->quadVertex() ); + if ( GLi->quadVertex() == 6 ) { setColor( idx + 0, color ); setColor( idx + 1, color ); setColor( idx + 2, color ); @@ -218,14 +218,14 @@ void VertexBuffer::setQuadColor( const Vector2u& gridPos, const Color& color ) { mDrawType == PrimitiveType::PRIMITIVE_QUAD_STRIP || mDrawType == PrimitiveType::PRIMITIVE_TRIANGLES ); eeASSERT( mGridSize != Sizei::Zero ); - eeASSERT( static_cast( gridPos.x * GLi->quadVertexs() + - gridPos.y * mGridSize.x * GLi->quadVertexs() + - GLi->quadVertexs() - 1 ) < mPosArray.size() ); - eeASSERT( static_cast( gridPos.x * GLi->quadVertexs() + - gridPos.y * mGridSize.x * GLi->quadVertexs() + - GLi->quadVertexs() - 1 ) < mColorArray.size() ); - int idx = ( gridPos.x * GLi->quadVertexs() + gridPos.y * mGridSize.x * GLi->quadVertexs() ); - if ( GLi->quadVertexs() == 6 ) { + eeASSERT( static_cast( gridPos.x * GLi->quadVertex() + + gridPos.y * mGridSize.x * GLi->quadVertex() + GLi->quadVertex() - + 1 ) < mPosArray.size() ); + eeASSERT( static_cast( gridPos.x * GLi->quadVertex() + + gridPos.y * mGridSize.x * GLi->quadVertex() + GLi->quadVertex() - + 1 ) < mColorArray.size() ); + int idx = ( gridPos.x * GLi->quadVertex() + gridPos.y * mGridSize.x * GLi->quadVertex() ); + if ( GLi->quadVertex() == 6 ) { setColor( idx + 0, color ); setColor( idx + 1, color ); setColor( idx + 2, color ); @@ -246,14 +246,14 @@ void VertexBuffer::setQuadFree( const Vector2u& gridPos, const Vector2f& pos0, c mDrawType == PrimitiveType::PRIMITIVE_QUAD_STRIP || mDrawType == PrimitiveType::PRIMITIVE_TRIANGLES ); eeASSERT( mGridSize != Sizei::Zero ); - eeASSERT( static_cast( gridPos.x * GLi->quadVertexs() + - gridPos.y * mGridSize.x * GLi->quadVertexs() + - GLi->quadVertexs() - 1 ) < mPosArray.size() ); - eeASSERT( static_cast( gridPos.x * GLi->quadVertexs() + - gridPos.y * mGridSize.x * GLi->quadVertexs() + - GLi->quadVertexs() - 1 ) < mColorArray.size() ); - int idx = ( gridPos.x * GLi->quadVertexs() + gridPos.y * mGridSize.x * GLi->quadVertexs() ); - if ( GLi->quadVertexs() == 6 ) { + eeASSERT( static_cast( gridPos.x * GLi->quadVertex() + + gridPos.y * mGridSize.x * GLi->quadVertex() + GLi->quadVertex() - + 1 ) < mPosArray.size() ); + eeASSERT( static_cast( gridPos.x * GLi->quadVertex() + + gridPos.y * mGridSize.x * GLi->quadVertex() + GLi->quadVertex() - + 1 ) < mColorArray.size() ); + int idx = ( gridPos.x * GLi->quadVertex() + gridPos.y * mGridSize.x * GLi->quadVertex() ); + if ( GLi->quadVertex() == 6 ) { setColor( idx + 0, color ); setColor( idx + 1, color ); setColor( idx + 2, color ); @@ -284,11 +284,11 @@ void VertexBuffer::setQuadTexCoords( const Vector2u& gridPos, const Rectf& coord mDrawType == PrimitiveType::PRIMITIVE_QUAD_STRIP || mDrawType == PrimitiveType::PRIMITIVE_TRIANGLES ); eeASSERT( mGridSize != Sizei::Zero ); - eeASSERT( static_cast( gridPos.x * GLi->quadVertexs() + - gridPos.y * mGridSize.x * GLi->quadVertexs() + - GLi->quadVertexs() - 1 ) < mTexCoordArray[textureLevel].size() ); - int idx = ( gridPos.x * GLi->quadVertexs() + gridPos.y * mGridSize.x * GLi->quadVertexs() ); - if ( GLi->quadVertexs() == 6 ) { + eeASSERT( static_cast( gridPos.x * GLi->quadVertex() + + gridPos.y * mGridSize.x * GLi->quadVertex() + GLi->quadVertex() - + 1 ) < mTexCoordArray[textureLevel].size() ); + int idx = ( gridPos.x * GLi->quadVertex() + gridPos.y * mGridSize.x * GLi->quadVertex() ); + if ( GLi->quadVertex() == 6 ) { // 1 0 3 1 2 3 setTextureCoord( idx + 0, { coords.Left, coords.Bottom }, textureLevel ); setTextureCoord( idx + 1, { coords.Left, coords.Top }, textureLevel ); diff --git a/src/eepp/network/http.cpp b/src/eepp/network/http.cpp index 98c7b2270..a6145dac5 100644 --- a/src/eepp/network/http.cpp +++ b/src/eepp/network/http.cpp @@ -428,7 +428,7 @@ const char* Http::Response::getStatusDescription() const { switch ( mStatus ) { // 2xx: success case Ok: - return "Successfull"; + return "Successful"; case Created: return "The resource has successfully been created"; case Accepted: @@ -450,16 +450,16 @@ const char* Http::Response::getStatusDescription() const { case MovedTemporarily: return "The requested page has temporarily moved to a new location"; case NotModified: - return "For conditionnal requests, means the requested page hasn't changed and doesn't " + return "For conditional requests, means the requested page hasn't changed and doesn't " "need to be refreshed"; // 4xx: client error case BadRequest: return "The server couldn't understand the request (syntax error)"; case Unauthorized: - return "The requested page needs an authentification to be accessed"; + return "The requested page needs an authentication to be accessed"; case Forbidden: - return "The requested page cannot be accessed at all, even with authentification"; + return "The requested page cannot be accessed at all, even with authentication"; case NotFound: return "The requested page doesn't exist"; case RangeNotSatisfiable: @@ -822,14 +822,14 @@ Http::Response Http::downloadRequest( const Http::Request& request, IOStream& wr // Send the request if ( sslSocket->tcpSend( tunnelStr.c_str(), tunnelStr.size(), sent ) == Socket::Done ) { char buffer[PACKET_BUFFER_SIZE + 1]; - std::size_t readed = 0; + std::size_t read = 0; // Get the proxy server response - if ( sslSocket->tcpReceive( buffer, PACKET_BUFFER_SIZE, readed ) == Socket::Done ) { + if ( sslSocket->tcpReceive( buffer, PACKET_BUFFER_SIZE, read ) == Socket::Done ) { // Parse the HTTP Tunnel request response Response tunnelResponse; std::string header; - header.append( buffer, readed ); + header.append( buffer, read ); tunnelResponse.parse( header ); if ( tunnelResponse.getStatus() == Response::Ok ) { @@ -898,7 +898,7 @@ Http::Response Http::downloadRequest( const Http::Request& request, IOStream& wr // Wait for the server's response std::size_t currentTotalBytes = 0; std::size_t len = 0; - std::size_t readed = 0; + std::size_t read = 0; char* eol = NULL; // end of line char* bol = NULL; // beginning of line char buffer[PACKET_BUFFER_SIZE + 1]; @@ -913,14 +913,14 @@ Http::Response Http::downloadRequest( const Http::Request& request, IOStream& wr while ( !request.isCancelled() && ( status = mConnection->getSocket()->receive( buffer, PACKET_BUFFER_SIZE, - readed ) ) == Socket::Done ) { + read ) ) == Socket::Done ) { char* readBuffer = buffer; // If we didn't receive the header yet, we will try to find the end of the // header if ( !isnheader ) { // calculate combined length of unprocessed data and new data - len += readed; + len += read; // NULL terminate buffer for string functions readBuffer[len] = '\0'; @@ -945,7 +945,7 @@ Http::Response Http::downloadRequest( const Http::Request& request, IOStream& wr bol += 1; // calculate the amount of data remaining in the buffer - len = readed - ( bol - readBuffer ); + len = read - ( bol - readBuffer ); // Fill the header buffer headerBuffer.append( readBuffer, ( bol - readBuffer ) ); @@ -1047,9 +1047,9 @@ Http::Response Http::downloadRequest( const Http::Request& request, IOStream& wr // of the file buffer if ( len > 0 ) { readBuffer = bol; - readed = len; + read = len; } else { - readed = 0; + read = 0; } headerBuffer.clear(); @@ -1063,10 +1063,10 @@ Http::Response Http::downloadRequest( const Http::Request& request, IOStream& wr } if ( isnheader ) { - currentTotalBytes += readed; + currentTotalBytes += read; - if ( readed > 0 ) - bufferStream->write( readBuffer, readed ); + if ( read > 0 ) + bufferStream->write( readBuffer, read ); if ( !sendProgress( *this, request, received, Request::ContentReceived, contentLength, currentTotalBytes ) ) { @@ -1526,7 +1526,8 @@ std::shared_ptr Http::Pool::get( const URI& host, const URI& proxy ) { } } - auto http = std::make_shared( host.getHost(), host.getPort(), host.getScheme() == "https" ); + auto http = + std::make_shared( host.getHost(), host.getPort(), host.getScheme() == "https" ); Lock l( mMutex ); mHttps[getHostHash( host, proxy )] = http; return http; diff --git a/src/eepp/network/tcplistener.cpp b/src/eepp/network/tcplistener.cpp index bb7bd18d8..91d05168f 100644 --- a/src/eepp/network/tcplistener.cpp +++ b/src/eepp/network/tcplistener.cpp @@ -9,7 +9,7 @@ TcpListener::TcpListener() : Socket( Tcp ) {} unsigned short TcpListener::getLocalPort() const { if ( getHandle() != Private::SocketImpl::invalidSocket() ) { - // Retrieve informations about the local end of the socket + // Retrieve information about the local end of the socket sockaddr_in address; Private::SocketImpl::AddrLength size = sizeof( address ); diff --git a/src/eepp/network/tcpsocket.cpp b/src/eepp/network/tcpsocket.cpp index 503ffecad..5497167b3 100644 --- a/src/eepp/network/tcpsocket.cpp +++ b/src/eepp/network/tcpsocket.cpp @@ -40,7 +40,7 @@ TcpSocket::~TcpSocket() { unsigned short TcpSocket::getLocalPort() const { if ( getHandle() != Private::SocketImpl::invalidSocket() ) { - // Retrieve informations about the local end of the socket + // Retrieve information about the local end of the socket sockaddr_in address; Private::SocketImpl::AddrLength size = sizeof( address ); if ( getsockname( getHandle(), reinterpret_cast( &address ), &size ) != -1 ) { @@ -54,7 +54,7 @@ unsigned short TcpSocket::getLocalPort() const { IpAddress TcpSocket::getRemoteAddress() const { if ( getHandle() != Private::SocketImpl::invalidSocket() ) { - // Retrieve informations about the remote end of the socket + // Retrieve information about the remote end of the socket sockaddr_in address; Private::SocketImpl::AddrLength size = sizeof( address ); if ( getpeername( getHandle(), reinterpret_cast( &address ), &size ) != -1 ) { @@ -68,7 +68,7 @@ IpAddress TcpSocket::getRemoteAddress() const { unsigned short TcpSocket::getRemotePort() const { if ( getHandle() != Private::SocketImpl::invalidSocket() ) { - // Retrieve informations about the remote end of the socket + // Retrieve information about the remote end of the socket sockaddr_in address; Private::SocketImpl::AddrLength size = sizeof( address ); if ( getpeername( getHandle(), reinterpret_cast( &address ), &size ) != -1 ) { @@ -123,7 +123,7 @@ Socket::Status TcpSocket::connect( const IpAddress& remoteAddress, unsigned shor // Get the error status Status status = Private::SocketImpl::getErrorStatus(); - // If we were in non-blocking mode, return immediatly + // If we were in non-blocking mode, return immediately if ( !blocking ) return status; diff --git a/src/eepp/network/udpsocket.cpp b/src/eepp/network/udpsocket.cpp index 00f1df929..27c2282d0 100644 --- a/src/eepp/network/udpsocket.cpp +++ b/src/eepp/network/udpsocket.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -15,7 +14,7 @@ UdpSocket::UdpSocket() : Socket( Udp ), mBuffer( MaxDatagramSize ) {} unsigned short UdpSocket::getLocalPort() const { if ( getHandle() != Private::SocketImpl::invalidSocket() ) { - // Retrieve informations about the local end of the socket + // Retrieve information about the local end of the socket sockaddr_in address; Private::SocketImpl::AddrLength size = sizeof( address ); if ( getsockname( getHandle(), reinterpret_cast( &address ), &size ) != -1 ) { @@ -106,7 +105,7 @@ Socket::Status UdpSocket::receive( void* data, std::size_t size, std::size_t& re if ( sizeReceived < 0 ) return Private::SocketImpl::getErrorStatus(); - // Fill the sender informations + // Fill the sender information received = static_cast( sizeReceived ); remoteAddress = IpAddress( ntohl( address.sin_addr.s_addr ) ); remotePort = ntohs( address.sin_port ); diff --git a/src/eepp/scene/node.cpp b/src/eepp/scene/node.cpp index dd57e8a00..1471fc9c1 100644 --- a/src/eepp/scene/node.cpp +++ b/src/eepp/scene/node.cpp @@ -40,7 +40,7 @@ Node::~Node() { if ( mNodeFlags & NODE_FLAG_SCHEDULED_UPDATE ) mSceneNode->unsubscribeScheduledUpdate( this ); - if ( isMouseOverMeOrChilds() ) + if ( isMouseOverMeOrChildren() ) mSceneNode->removeMouseOverNode( this ); } @@ -372,7 +372,7 @@ bool Node::isMouseOver() const { return 0 != ( mNodeFlags & NODE_FLAG_MOUSEOVER ); } -bool Node::isMouseOverMeOrChilds() const { +bool Node::isMouseOverMeOrChildren() const { return 0 != ( mNodeFlags & NODE_FLAG_MOUSEOVER_ME_OR_CHILD ); } @@ -382,7 +382,7 @@ Uint32 Node::onMouseDoubleClick( const Vector2i& Pos, const Uint32& Flags ) { } Uint32 Node::onMouseOver( const Vector2i& Pos, const Uint32& Flags ) { - if ( NULL != mParentNode && mParentNode->isMouseOverMeOrChilds() ) + if ( NULL != mParentNode && mParentNode->isMouseOverMeOrChildren() ) mParentNode->onMouseOver( Pos, Flags ); writeNodeFlag( NODE_FLAG_MOUSEOVER, 1 ); @@ -398,7 +398,7 @@ Uint32 Node::onMouseOver( const Vector2i& Pos, const Uint32& Flags ) { } Uint32 Node::onMouseLeave( const Vector2i& Pos, const Uint32& Flags ) { - if ( NULL != mParentNode && !mParentNode->isMouseOverMeOrChilds() ) + if ( NULL != mParentNode && !mParentNode->isMouseOverMeOrChildren() ) mParentNode->onMouseLeave( Pos, Flags ); writeNodeFlag( NODE_FLAG_MOUSEOVER, 0 ); @@ -529,7 +529,7 @@ void Node::setNodeFlags( const Uint32& flags ) { mNodeFlags = flags; } -void Node::drawChilds() { +void Node::drawChildren() { if ( isReverseDraw() ) { Node* child = mChildLast; @@ -566,7 +566,7 @@ void Node::nodeDraw() { draw(); - drawChilds(); + drawChildren(); clipEnd( needsClipPlanes ); @@ -1740,7 +1740,7 @@ bool Node::reportSizeChangeToChilds() const { return 0 != ( mNodeFlags & NODE_FLAG_REPORT_SIZE_CHANGE_TO_CHILDS ); } -void Node::enableReportSizeChangeToChilds() { +void Node::enableReportSizeChangeToChildren() { writeNodeFlag( NODE_FLAG_REPORT_SIZE_CHANGE_TO_CHILDS, 1 ); } diff --git a/src/eepp/scene/scenenode.cpp b/src/eepp/scene/scenenode.cpp index 2408d4f61..a716b5ff8 100644 --- a/src/eepp/scene/scenenode.cpp +++ b/src/eepp/scene/scenenode.cpp @@ -36,7 +36,7 @@ SceneNode::SceneNode( EE::Window::Window* window ) : mNodeFlags |= NODE_FLAG_SCENENODE; mSceneNode = this; - enableReportSizeChangeToChilds(); + enableReportSizeChangeToChildren(); if ( NULL == mWindow ) { mWindow = Engine::instance()->getCurrentWindow(); @@ -109,7 +109,7 @@ void SceneNode::draw() { clipStart( needsClipPlanes ); - drawChilds(); + drawChildren(); clipEnd( needsClipPlanes ); } diff --git a/src/eepp/system/platform/posix/conditionimpl.cpp b/src/eepp/system/platform/posix/conditionimpl.cpp index c3cf2a3ca..d806c1cd2 100644 --- a/src/eepp/system/platform/posix/conditionimpl.cpp +++ b/src/eepp/system/platform/posix/conditionimpl.cpp @@ -7,7 +7,7 @@ namespace EE { namespace System { namespace Platform { ConditionImpl::ConditionImpl( int var ) : - mIsInvalid( true ), mConditionnedVar( var ), mCond(), mMutex() { + mIsInvalid( true ), mConditionedVar( var ), mCond(), mMutex() { if ( 0 != pthread_cond_init( &mCond, NULL ) ) std::cerr << "ConditionImpl::ConditionImpl(): pthread_cond_init() error\n"; @@ -34,7 +34,7 @@ void ConditionImpl::unlock() { bool ConditionImpl::waitAndRetain( int value ) { pthread_mutex_lock( &mMutex ); - while ( mConditionnedVar != value && mIsInvalid ) { + while ( mConditionedVar != value && mIsInvalid ) { pthread_cond_wait( &mCond, &mMutex ); } @@ -48,7 +48,7 @@ bool ConditionImpl::waitAndRetain( int value ) { } void ConditionImpl::release( int value ) { - mConditionnedVar = value; + mConditionedVar = value; pthread_mutex_unlock( &mMutex ); @@ -59,7 +59,7 @@ void ConditionImpl::setValue( int value ) { // Make sure the Condition's value is not modified while retained pthread_mutex_lock( &mMutex ); - mConditionnedVar = value; + mConditionedVar = value; pthread_mutex_unlock( &mMutex ); @@ -67,7 +67,7 @@ void ConditionImpl::setValue( int value ) { } int ConditionImpl::value() const { - return mConditionnedVar; + return mConditionedVar; } void ConditionImpl::signal() { diff --git a/src/eepp/system/platform/posix/conditionimpl.hpp b/src/eepp/system/platform/posix/conditionimpl.hpp index fb03465a2..373be208d 100644 --- a/src/eepp/system/platform/posix/conditionimpl.hpp +++ b/src/eepp/system/platform/posix/conditionimpl.hpp @@ -35,7 +35,7 @@ class ConditionImpl { private: int mIsInvalid; - int mConditionnedVar; + int mConditionedVar; pthread_cond_t mCond; pthread_mutex_t mMutex; diff --git a/src/eepp/system/platform/win/conditionimpl.cpp b/src/eepp/system/platform/win/conditionimpl.cpp index bed1b7f5d..efac5c2f0 100644 --- a/src/eepp/system/platform/win/conditionimpl.cpp +++ b/src/eepp/system/platform/win/conditionimpl.cpp @@ -6,7 +6,7 @@ namespace EE { namespace System { namespace Platform { -ConditionImpl::ConditionImpl( int var ) : mIsValid( true ), mConditionnedVar( var ), mMutex() { +ConditionImpl::ConditionImpl( int var ) : mIsValid( true ), mConditionedVar( var ), mMutex() { mCond = CreateEvent( NULL, FALSE, FALSE, NULL ); if ( mCond == NULL ) @@ -28,7 +28,7 @@ void ConditionImpl::unlock() { bool ConditionImpl::waitAndRetain( int value ) { mMutex.lock(); - while ( mConditionnedVar != value && mIsValid ) { + while ( mConditionedVar != value && mIsValid ) { mMutex.unlock(); WaitForSingleObject( mCond, INFINITE ); @@ -45,7 +45,7 @@ bool ConditionImpl::waitAndRetain( int value ) { } void ConditionImpl::release( int value ) { - mConditionnedVar = value; + mConditionedVar = value; mMutex.unlock(); signal(); @@ -54,14 +54,14 @@ void ConditionImpl::release( int value ) { void ConditionImpl::setValue( int value ) { // Make sure the Condition's value is not modified while retained mMutex.lock(); - mConditionnedVar = value; + mConditionedVar = value; mMutex.unlock(); signal(); } int ConditionImpl::value() const { - return mConditionnedVar; + return mConditionedVar; } void ConditionImpl::signal() { diff --git a/src/eepp/system/platform/win/conditionimpl.hpp b/src/eepp/system/platform/win/conditionimpl.hpp index 53e8b602b..7dd797b15 100644 --- a/src/eepp/system/platform/win/conditionimpl.hpp +++ b/src/eepp/system/platform/win/conditionimpl.hpp @@ -40,7 +40,7 @@ class ConditionImpl { private: int mIsValid; - int mConditionnedVar; + int mConditionedVar; HANDLE mCond; Mutex mMutex; diff --git a/src/eepp/ui/css/stylesheetstyle.cpp b/src/eepp/ui/css/stylesheetstyle.cpp index a7938e60a..1518a6897 100644 --- a/src/eepp/ui/css/stylesheetstyle.cpp +++ b/src/eepp/ui/css/stylesheetstyle.cpp @@ -23,10 +23,10 @@ StyleSheetStyle::StyleSheetStyle( const std::string& selector, } } -std::string StyleSheetStyle::build( bool emmitMediaQueryStart, bool emmitMediaQueryEnd ) { +std::string StyleSheetStyle::build( bool emitMediaQueryStart, bool emitMediaQueryEnd ) { std::string css; - if ( emmitMediaQueryStart && mMediaQueryList && !mMediaQueryList->getQueryString().empty() ) + if ( emitMediaQueryStart && mMediaQueryList && !mMediaQueryList->getQueryString().empty() ) css += mMediaQueryList->getQueryString() + " {\n\n"; css += mSelector.getName() + " {\n"; @@ -42,7 +42,7 @@ std::string StyleSheetStyle::build( bool emmitMediaQueryStart, bool emmitMediaQu css += "}\n\n"; - if ( emmitMediaQueryEnd && mMediaQueryList && !mMediaQueryList->getQueryString().empty() ) + if ( emitMediaQueryEnd && mMediaQueryList && !mMediaQueryList->getQueryString().empty() ) css += "}\n\n"; return css; diff --git a/src/eepp/ui/doc/foldrangeservice.cpp b/src/eepp/ui/doc/foldrangeservice.cpp index c16beb7f7..84dbd8405 100644 --- a/src/eepp/ui/doc/foldrangeservice.cpp +++ b/src/eepp/ui/doc/foldrangeservice.cpp @@ -194,9 +194,9 @@ static std::vector findFoldingRangesMarkdown( TextDocument* doc ) { return regions; } -FoldRangeServive::FoldRangeServive( TextDocument* doc ) : mDoc( doc ) {} +FoldRangeService::FoldRangeService( TextDocument* doc ) : mDoc( doc ) {} -bool FoldRangeServive::canFold() const { +bool FoldRangeService::canFold() const { if ( !mEnabled ) return false; if ( mProvider && mProvider->foldingRangeProvider() ) @@ -206,7 +206,7 @@ bool FoldRangeServive::canFold() const { type == FoldRangeType::Markdown; } -void FoldRangeServive::findRegions() { +void FoldRangeService::findRegions() { if ( !mEnabled || mDoc == nullptr || !canFold() ) return; @@ -218,7 +218,7 @@ void FoldRangeServive::findRegions() { findRegionsNative(); } -void FoldRangeServive::findRegionsNative() { +void FoldRangeService::findRegionsNative() { if ( !mEnabled || mDoc == nullptr || !canFold() ) return; @@ -236,17 +236,17 @@ void FoldRangeServive::findRegionsNative() { } } -void FoldRangeServive::clear() { +void FoldRangeService::clear() { Lock l( mMutex ); mFoldingRegions.clear(); } -bool FoldRangeServive::empty() { +bool FoldRangeService::empty() { Lock l( mMutex ); return mFoldingRegions.empty(); } -std::optional FoldRangeServive::find( Int64 docIdx ) { +std::optional FoldRangeService::find( Int64 docIdx ) { Lock l( mMutex ); auto foldRegionIt = mFoldingRegions.find( docIdx ); if ( foldRegionIt == mFoldingRegions.end() ) @@ -254,7 +254,7 @@ std::optional FoldRangeServive::find( Int64 docIdx ) { return foldRegionIt->second; } -void FoldRangeServive::addFoldRegions( std::vector regions ) { +void FoldRangeService::addFoldRegions( std::vector regions ) { size_t newCount; size_t oldCount; { @@ -269,13 +269,13 @@ void FoldRangeServive::addFoldRegions( std::vector regions ) { mDoc->notifyFoldRegionsUpdated( oldCount, newCount ); } -bool FoldRangeServive::isFoldingRegionInLine( Int64 docIdx ) { +bool FoldRangeService::isFoldingRegionInLine( Int64 docIdx ) { Lock l( mMutex ); auto foldRegionIt = mFoldingRegions.find( docIdx ); return foldRegionIt != mFoldingRegions.end(); } -void FoldRangeServive::shiftFoldingRegions( Int64 fromLine, Int64 numLines ) { +void FoldRangeService::shiftFoldingRegions( Int64 fromLine, Int64 numLines ) { // TODO: Optimize this Lock l( mMutex ); std::unordered_map foldingRegions; @@ -290,7 +290,7 @@ void FoldRangeServive::shiftFoldingRegions( Int64 fromLine, Int64 numLines ) { mFoldingRegions = foldingRegions; } -void FoldRangeServive::setFoldingRegions( std::vector regions ) { +void FoldRangeService::setFoldingRegions( std::vector regions ) { size_t newCount = regions.size(); size_t oldCount; { @@ -306,26 +306,26 @@ void FoldRangeServive::setFoldingRegions( std::vector regions ) { mDoc->notifyFoldRegionsUpdated( oldCount, newCount ); } -FoldRangeProvider* FoldRangeServive::getProvider() const { +FoldRangeProvider* FoldRangeService::getProvider() const { return mProvider; } -bool FoldRangeServive::hasProvider() const { +bool FoldRangeService::hasProvider() const { return mProvider != nullptr; } -void FoldRangeServive::setProvider( FoldRangeProvider* provider ) { +void FoldRangeService::setProvider( FoldRangeProvider* provider ) { mProvider = provider; if ( provider == nullptr ) { mFoldingRegions.clear(); } } -bool FoldRangeServive::isEnabled() const { +bool FoldRangeService::isEnabled() const { return mEnabled; } -void FoldRangeServive::setEnabled( bool enabled ) { +void FoldRangeService::setEnabled( bool enabled ) { mEnabled = enabled; } diff --git a/src/eepp/ui/doc/textdocument.cpp b/src/eepp/ui/doc/textdocument.cpp index a01b35853..638c1f060 100644 --- a/src/eepp/ui/doc/textdocument.cpp +++ b/src/eepp/ui/doc/textdocument.cpp @@ -3367,11 +3367,11 @@ void TextDocument::setEncoding( TextFormat::Encoding encoding ) { mEncoding = encoding; } -const FoldRangeServive& TextDocument::getFoldRangeService() const { +const FoldRangeService& TextDocument::getFoldRangeService() const { return mFoldRangeService; } -FoldRangeServive& TextDocument::getFoldRangeService() { +FoldRangeService& TextDocument::getFoldRangeService() { return mFoldRangeService; } diff --git a/src/eepp/ui/models/filesystemmodel.cpp b/src/eepp/ui/models/filesystemmodel.cpp index d90842fa9..cb489de24 100644 --- a/src/eepp/ui/models/filesystemmodel.cpp +++ b/src/eepp/ui/models/filesystemmodel.cpp @@ -478,7 +478,7 @@ size_t FileSystemModel::columnCount( const ModelIndex& ) const { return Column::Count; } -bool FileSystemModel::hasChilds( const ModelIndex& index ) const { +bool FileSystemModel::hasChildren( const ModelIndex& index ) const { Node& node = const_cast( this->node( index ) ); if ( node.mInfoDirty ) node.fetchData( node.fullPath() ); diff --git a/src/eepp/ui/tools/textureatlasnew.cpp b/src/eepp/ui/tools/textureatlasnew.cpp index d75b95a2f..b0a4f9f16 100644 --- a/src/eepp/ui/tools/textureatlasnew.cpp +++ b/src/eepp/ui/tools/textureatlasnew.cpp @@ -12,7 +12,7 @@ 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_CHILDS | + UI_WIN_CLOSE_BUTTON | UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS | UI_WIN_SHARE_ALPHA_WITH_CHILDREN | UI_WIN_MODAL ); mUIWindow->addEventListener( Event::OnWindowClose, diff --git a/src/eepp/ui/tools/uidocfindreplace.cpp b/src/eepp/ui/tools/uidocfindreplace.cpp index 968508d0a..8a3b3def0 100644 --- a/src/eepp/ui/tools/uidocfindreplace.cpp +++ b/src/eepp/ui/tools/uidocfindreplace.cpp @@ -169,7 +169,7 @@ UIDocFindReplace::UIDocFindReplace( UIWidget* parent, const std::shared_ptrgetWindow()->getInput() ), mDoc( doc ) { - mFlags |= UI_OWNS_CHILDS_POSITION; + mFlags |= UI_OWNS_CHILDREN_POSITION; getKeyBindings().addKeybindsStringUnordered( keybindings ); diff --git a/src/eepp/ui/uicodeeditor.cpp b/src/eepp/ui/uicodeeditor.cpp index 6ab027f6f..738b10d20 100644 --- a/src/eepp/ui/uicodeeditor.cpp +++ b/src/eepp/ui/uicodeeditor.cpp @@ -135,7 +135,7 @@ UICodeEditor::UICodeEditor( const std::string& elementTag, const bool& autoRegis mPreviewColor( Color::Transparent ), mKeyBindings( getUISceneNode()->getWindow()->getInput() ), mFindLongestLineWidthUpdateFrequency( Seconds( 1 ) ) { - mFlags |= UI_TAB_STOP | UI_OWNS_CHILDS_POSITION | UI_SCROLLABLE; + mFlags |= UI_TAB_STOP | UI_OWNS_CHILDREN_POSITION | UI_SCROLLABLE; setTextSelection( true ); setColorScheme( SyntaxColorScheme::getDefault() ); refreshTag(); @@ -462,7 +462,7 @@ void UICodeEditor::scheduledUpdate( const Time& ) { mMouseDown = false; mMouseDownMinimap = false; getUISceneNode()->getWindow()->getInput()->captureMouse( false ); - } else if ( !isMouseOverMeOrChilds() || mMinimapDragging ) { + } else if ( !isMouseOverMeOrChildren() || mMinimapDragging ) { onMouseMove( getUISceneNode()->getEventDispatcher()->getMousePos(), getUISceneNode()->getEventDispatcher()->getPressTrigger() ); } @@ -1759,7 +1759,7 @@ Uint32 UICodeEditor::onMouseClick( const Vector2i& position, const Uint32& flags Engine::instance()->openURI( link.toUtf8() ); resetLinkOver( position ); } - } else if ( ( flags & EE_BUTTON_MMASK ) && isMouseOverMeOrChilds() ) { + } else if ( ( flags & EE_BUTTON_MMASK ) && isMouseOverMeOrChildren() ) { auto txt( getUISceneNode()->getWindow()->getClipboard()->getText() ); if ( !isLocked() && !txt.empty() ) { if ( mDoc->hasSelection() ) { @@ -2374,30 +2374,30 @@ void UICodeEditor::showMinimap( bool showMinimap ) { } } -bool UICodeEditor::setScrollX( const Float& val, bool emmitEvent ) { +bool UICodeEditor::setScrollX( const Float& val, bool emitEvent ) { Float oldVal = mScroll.x; mScroll.x = eefloor( eeclamp( val, 0.f, getMaxScroll().x ) ); if ( oldVal != mScroll.x ) { invalidateDraw(); updateIMELocation(); - if ( emmitEvent ) + if ( emitEvent ) sendCommonEvent( Event::OnScrollChange ); - if ( mHorizontalScrollBarEnabled && emmitEvent ) + if ( mHorizontalScrollBarEnabled && emitEvent ) mHScrollBar->setValue( mScroll.x / getMaxScroll().x, false ); return true; } return false; } -bool UICodeEditor::setScrollY( const Float& val, bool emmitEvent ) { +bool UICodeEditor::setScrollY( const Float& val, bool emitEvent ) { Float oldVal = mScroll.y; mScroll.y = eefloor( eeclamp( val, 0, getMaxScroll().y ) ); if ( oldVal != mScroll.y ) { invalidateDraw(); updateIMELocation(); - if ( emmitEvent ) + if ( emitEvent ) sendCommonEvent( Event::OnScrollChange ); - if ( mVerticalScrollBarEnabled && emmitEvent ) + if ( mVerticalScrollBarEnabled && emitEvent ) mVScrollBar->setValue( mScroll.y / getMaxScroll().y, false ); return true; } @@ -2727,9 +2727,9 @@ const Vector2f& UICodeEditor::getFontShadowOffset() const { return mFontStyleConfig.getFontShadowOffset(); } -void UICodeEditor::setScroll( const Vector2f& val, bool emmitEvent ) { - setScrollX( val.x, emmitEvent ); - setScrollY( val.y, emmitEvent ); +void UICodeEditor::setScroll( const Vector2f& val, bool emitEvent ) { + setScrollX( val.x, emitEvent ); + setScrollY( val.y, emitEvent ); } bool UICodeEditor::getShowLineEndings() const { diff --git a/src/eepp/ui/uigridlayout.cpp b/src/eepp/ui/uigridlayout.cpp index e1340d2c4..1bf915a5d 100644 --- a/src/eepp/ui/uigridlayout.cpp +++ b/src/eepp/ui/uigridlayout.cpp @@ -15,7 +15,7 @@ UIGridLayout::UIGridLayout() : mColumnWidth( 0 ), mRowWeight( 0.25f ), mRowHeight( 0 ) { - mFlags |= UI_OWNS_CHILDS_POSITION; + mFlags |= UI_OWNS_CHILDREN_POSITION; } Uint32 UIGridLayout::getType() const { diff --git a/src/eepp/ui/uilinearlayout.cpp b/src/eepp/ui/uilinearlayout.cpp index 73c94def8..7eb6cc317 100644 --- a/src/eepp/ui/uilinearlayout.cpp +++ b/src/eepp/ui/uilinearlayout.cpp @@ -23,13 +23,13 @@ UILinearLayout* UILinearLayout::NewHorizontal() { UILinearLayout::UILinearLayout() : UILayout( "linearlayout" ), mOrientation( UIOrientation::Vertical ) { - mFlags |= UI_OWNS_CHILDS_POSITION; + mFlags |= UI_OWNS_CHILDREN_POSITION; setClipType( ClipType::ContentBox ); } UILinearLayout::UILinearLayout( const std::string& tag, const UIOrientation& orientation ) : UILayout( tag ), mOrientation( orientation ) { - mFlags |= UI_OWNS_CHILDS_POSITION; + mFlags |= UI_OWNS_CHILDREN_POSITION; setClipType( ClipType::ContentBox ); } diff --git a/src/eepp/ui/uilistbox.cpp b/src/eepp/ui/uilistbox.cpp index 7c7829571..1f6c4cd0f 100644 --- a/src/eepp/ui/uilistbox.cpp +++ b/src/eepp/ui/uilistbox.cpp @@ -347,8 +347,8 @@ void UIListBox::onTouchDragValueChange( Vector2f diff ) { } bool UIListBox::isTouchOverAllowedChilds() { - return isMouseOverMeOrChilds() && !mVScrollBar->isMouseOverMeOrChilds() && - !mHScrollBar->isMouseOverMeOrChilds(); + return isMouseOverMeOrChildren() && !mVScrollBar->isMouseOverMeOrChildren() && + !mHScrollBar->isMouseOverMeOrChildren(); } void UIListBox::findMaxWidth() { diff --git a/src/eepp/ui/uimenubar.cpp b/src/eepp/ui/uimenubar.cpp index be0de0d5b..15365ef55 100644 --- a/src/eepp/ui/uimenubar.cpp +++ b/src/eepp/ui/uimenubar.cpp @@ -85,10 +85,10 @@ void UIMenuBar::showPrevMenu() { } UIMenuBar::~UIMenuBar() { - destroyMenues(); + destroyMenus(); } -void UIMenuBar::destroyMenues() { +void UIMenuBar::destroyMenus() { if ( !SceneManager::instance()->isShuttingDown() ) { for ( MenuBarList::iterator it = mButtons.begin(); it != mButtons.end(); ++it ) { if ( it->second && it->second->getParent() != this ) { diff --git a/src/eepp/ui/uinode.cpp b/src/eepp/ui/uinode.cpp index 2595de255..f78957b7b 100644 --- a/src/eepp/ui/uinode.cpp +++ b/src/eepp/ui/uinode.cpp @@ -1084,7 +1084,7 @@ void UINode::nodeDraw() { draw(); - drawChilds(); + drawChildren(); smartClipEnd( ClipType::PaddingBox, needsClipPlanes ); @@ -1093,7 +1093,7 @@ void UINode::nodeDraw() { smartClipEnd( ClipType::ContentBox, needsClipPlanes ); } else if ( !isClipped() ) { - drawChilds(); + drawChildren(); } if ( intersected ) @@ -1545,7 +1545,7 @@ void UINode::startDragging( const Vector2f& position ) { } bool UINode::ownsChildPosition() const { - return 0 != ( mFlags & UI_OWNS_CHILDS_POSITION ); + return 0 != ( mFlags & UI_OWNS_CHILDREN_POSITION ); } void UINode::setDragButton( const Uint32& Button ) { diff --git a/src/eepp/ui/uirelativelayout.cpp b/src/eepp/ui/uirelativelayout.cpp index 6e839361f..c54669069 100644 --- a/src/eepp/ui/uirelativelayout.cpp +++ b/src/eepp/ui/uirelativelayout.cpp @@ -8,11 +8,11 @@ UIRelativeLayout* UIRelativeLayout::New() { } UIRelativeLayout::UIRelativeLayout() : UILayout( "relativelayout" ) { - mFlags |= UI_OWNS_CHILDS_POSITION; + mFlags |= UI_OWNS_CHILDREN_POSITION; } UIRelativeLayout::UIRelativeLayout( const std::string& tagName ) : UILayout( tagName ) { - mFlags |= UI_OWNS_CHILDS_POSITION; + mFlags |= UI_OWNS_CHILDREN_POSITION; } Uint32 UIRelativeLayout::getType() const { diff --git a/src/eepp/ui/uiscenenode.cpp b/src/eepp/ui/uiscenenode.cpp index 1b7326c52..2db2a6aad 100644 --- a/src/eepp/ui/uiscenenode.cpp +++ b/src/eepp/ui/uiscenenode.cpp @@ -41,7 +41,7 @@ UISceneNode::UISceneNode( EE::Window::Window* window ) : mUIThemeManager( UIThemeManager::New() ), 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 emmit + // Reset size since the SceneNode already set it but needs to set the size from zero to emit // the required events to its childs. mSize = Sizef(); mDpSize = Sizef(); @@ -55,7 +55,7 @@ UISceneNode::UISceneNode( EE::Window::Window* window ) : mRoot = UIRoot::New(); mRoot->setParent( this )->setPosition( 0, 0 )->setId( "uiscenenode_root_node" ); - mRoot->enableReportSizeChangeToChilds(); + mRoot->enableReportSizeChangeToChildren(); resizeNode( mWindow ); } diff --git a/src/eepp/ui/uiscrollablewidget.cpp b/src/eepp/ui/uiscrollablewidget.cpp index 828dc5ac1..9ea24893e 100644 --- a/src/eepp/ui/uiscrollablewidget.cpp +++ b/src/eepp/ui/uiscrollablewidget.cpp @@ -13,7 +13,7 @@ UIScrollableWidget::UIScrollableWidget( const std::string& tag ) : mHScroll( UIScrollBar::NewHorizontal() ), mSizeChangeCb( 0 ), mPosChangeCb( 0 ) { - mFlags |= UI_OWNS_CHILDS_POSITION | UI_SCROLLABLE; + mFlags |= UI_OWNS_CHILDREN_POSITION | UI_SCROLLABLE; mVScroll->setParent( this ); mHScroll->setParent( this ); diff --git a/src/eepp/ui/uiscrollbar.cpp b/src/eepp/ui/uiscrollbar.cpp index c1e78519b..c03a9dffa 100644 --- a/src/eepp/ui/uiscrollbar.cpp +++ b/src/eepp/ui/uiscrollbar.cpp @@ -283,8 +283,8 @@ Uint32 UIScrollBar::onMessage( const NodeMessage* Msg ) { return 0; } -void UIScrollBar::setValue( Float val, const bool& emmitEvent ) { - mSlider->setValue( val, emmitEvent ); +void UIScrollBar::setValue( Float val, const bool& emitEvent ) { + mSlider->setValue( val, emitEvent ); } const Float& UIScrollBar::getValue() const { diff --git a/src/eepp/ui/uiscrollview.cpp b/src/eepp/ui/uiscrollview.cpp index 72311641b..68efeea65 100644 --- a/src/eepp/ui/uiscrollview.cpp +++ b/src/eepp/ui/uiscrollview.cpp @@ -19,15 +19,15 @@ UIScrollView::UIScrollView() : mScrollView( NULL ), mSizeChangeCb( 0 ), mPosChangeCb( 0 ) { - mFlags |= UI_OWNS_CHILDS_POSITION | UI_SCROLLABLE; - enableReportSizeChangeToChilds(); + mFlags |= UI_OWNS_CHILDREN_POSITION | UI_SCROLLABLE; + enableReportSizeChangeToChildren(); mVScroll->setParent( this ); mHScroll->setParent( this ); mContainer->setParent( this ); mContainer->setClipType( ClipType::ContentBox ); - mContainer->setFlags( UI_OWNS_CHILDS_POSITION ); - mContainer->enableReportSizeChangeToChilds(); + mContainer->setFlags( UI_OWNS_CHILDREN_POSITION ); + mContainer->enableReportSizeChangeToChildren(); mContainer->on( Event::OnSizeChange, [this]( auto ) { containerUpdate(); } ); mVScroll->on( Event::OnValueChange, [this]( auto event ) { onValueChangeCb( event ); } ); @@ -281,9 +281,9 @@ void UIScrollView::onTouchDragValueChange( Vector2f diff ) { bool UIScrollView::isTouchOverAllowedChilds() { bool ret = mViewType == Exclusive - ? !mVScroll->isMouseOverMeOrChilds() && !mHScroll->isMouseOverMeOrChilds() + ? !mVScroll->isMouseOverMeOrChildren() && !mHScroll->isMouseOverMeOrChildren() : true; - return isMouseOverMeOrChilds() && mScrollView->isMouseOverMeOrChilds() && ret; + return isMouseOverMeOrChildren() && mScrollView->isMouseOverMeOrChildren() && ret; } std::string UIScrollView::getPropertyString( const PropertyDefinition* propertyDef, diff --git a/src/eepp/ui/uislider.cpp b/src/eepp/ui/uislider.cpp index eafb85a0d..82ba5a5f4 100644 --- a/src/eepp/ui/uislider.cpp +++ b/src/eepp/ui/uislider.cpp @@ -340,7 +340,7 @@ void UISlider::adjustSliderPos() { mOnPosChange = false; } -void UISlider::setValue( Float val, bool emmitEvent ) { +void UISlider::setValue( Float val, bool emitEvent ) { if ( val < mMinValue ) val = mMinValue; if ( val > mMaxValue ) @@ -360,7 +360,7 @@ void UISlider::setValue( Float val, bool emmitEvent ) { mOnPosChange = false; } - if ( emmitEvent ) + if ( emitEvent ) onValueChange(); } } diff --git a/src/eepp/ui/uisplitter.cpp b/src/eepp/ui/uisplitter.cpp index 61d2cb6f6..85e6bedc2 100644 --- a/src/eepp/ui/uisplitter.cpp +++ b/src/eepp/ui/uisplitter.cpp @@ -15,7 +15,7 @@ UISplitter::UISplitter() : mSplitPartition( StyleSheetLength( "50%" ) ), mFirstWidget( NULL ), mLastWidget( NULL ) { - mFlags |= UI_OWNS_CHILDS_POSITION; + mFlags |= UI_OWNS_CHILDREN_POSITION; mSplitter = UIWidget::NewWithTag( "splitter::separator" ); mSplitter->setDragEnabled( true ); mSplitter->on( Event::OnDragStart, diff --git a/src/eepp/ui/uistacklayout.cpp b/src/eepp/ui/uistacklayout.cpp index c8a0e71ac..01659c775 100644 --- a/src/eepp/ui/uistacklayout.cpp +++ b/src/eepp/ui/uistacklayout.cpp @@ -14,7 +14,7 @@ UIStackLayout* UIStackLayout::New() { UIStackLayout::UIStackLayout() : UIStackLayout( "stacklayout" ) {} UIStackLayout::UIStackLayout( const std::string& tag ) : UILayout( tag ) { - mFlags |= UI_OWNS_CHILDS_POSITION; + mFlags |= UI_OWNS_CHILDREN_POSITION; setClipType( ClipType::ContentBox ); setGravity( UI_HALIGN_LEFT | UI_VALIGN_TOP ); listenParent(); diff --git a/src/eepp/ui/uitableview.cpp b/src/eepp/ui/uitableview.cpp index c13ea6999..3b805f5b4 100644 --- a/src/eepp/ui/uitableview.cpp +++ b/src/eepp/ui/uitableview.cpp @@ -27,7 +27,7 @@ bool UITableView::isType( const Uint32& type ) const { return UITableView::getType() == type ? true : UIAbstractTableView::isType( type ); } -void UITableView::drawChilds() { +void UITableView::drawChildren() { int realRowIndex = 0; int realColIndex = 0; ConditionalLock l( getModel() != nullptr, getModel() ? &getModel()->resourceMutex() : nullptr ); @@ -133,7 +133,7 @@ Node* UITableView::overFind( const Vector2f& point ) { Float UITableView::getMaxColumnContentWidth( const size_t& colIndex, bool bestGuess ) { Float lWidth = 0; ConditionalLock l( getModel() != nullptr, getModel() ? &getModel()->resourceMutex() : nullptr ); - if ( nullptr == getModel() || !getModel()->hasChilds() ) + if ( nullptr == getModel() || !getModel()->hasChildren() ) return lWidth; ScopedOp op( [this] { mUISceneNode->setIsLoading( true ); }, [this] { mUISceneNode->setIsLoading( false ); } ); @@ -385,7 +385,7 @@ ModelIndex UITableView::findRowWithText( const std::string& text, const bool& ca const Model* model = getModel(); ConditionalLock l( getModel() != nullptr, getModel() ? &const_cast( getModel() )->resourceMutex() : nullptr ); - if ( !model || !model->hasChilds() ) + if ( !model || !model->hasChildren() ) return {}; size_t rc = model->rowCount(); for ( size_t i = 0; i < rc; i++ ) { diff --git a/src/eepp/ui/uitouchdraggablewidget.cpp b/src/eepp/ui/uitouchdraggablewidget.cpp index 6e9b3d2fc..85339d5e1 100644 --- a/src/eepp/ui/uitouchdraggablewidget.cpp +++ b/src/eepp/ui/uitouchdraggablewidget.cpp @@ -59,7 +59,7 @@ UITouchDraggableWidget::setTouchDragDeceleration( const Vector2f& touchDragDecel void UITouchDraggableWidget::onTouchDragValueChange( Vector2f ) {} bool UITouchDraggableWidget::isTouchOverAllowedChilds() { - return isMouseOverMeOrChilds(); + return isMouseOverMeOrChildren(); } void UITouchDraggableWidget::scheduledUpdate( const Time& time ) { diff --git a/src/eepp/ui/uitreeview.cpp b/src/eepp/ui/uitreeview.cpp index fe203085b..8636d1e87 100644 --- a/src/eepp/ui/uitreeview.cpp +++ b/src/eepp/ui/uitreeview.cpp @@ -157,13 +157,13 @@ void UITreeView::bindNavigationClick( UIWidget* widget ) { } bool UITreeView::tryOpenModelIndex( const ModelIndex& index, bool forceUpdate ) { - bool hasChilds = false; + bool hasChildren = false; { ConditionalLock l( getModel() != nullptr, getModel() ? &getModel()->resourceMutex() : nullptr ); - hasChilds = getModel()->hasChilds( index ); + hasChildren = getModel()->hasChildren( index ); } - if ( hasChilds ) { + if ( hasChildren ) { auto& data = getIndexMetadata( index ); if ( !data.open ) { data.open = true; @@ -199,7 +199,7 @@ UIWidget* UITreeView::setupCell( UITableCell* widget, UIWidget* rowWidget, ConditionalLock l( getModel() != nullptr, getModel() ? &getModel()->resourceMutex() : nullptr ); auto idx = mouseEvent->getNode()->getParent()->asType()->getCurIndex(); - if ( getModel()->hasChilds( idx ) ) { + if ( getModel()->hasChildren( idx ) ) { auto& data = getIndexMetadata( idx ); data.open = !data.open; createOrUpdateColumns( false ); @@ -248,7 +248,7 @@ UIWidget* UITreeView::updateCell( const Vector2& posIndex, const ModelInd UITableCell* cell = widget->asType(); updateTableCellData( cell, index ); - bool hasChilds = false; + bool hasChildren = false; if ( widget->isType( UI_TYPE_TREEVIEW_CELL ) && index.column() == (Int64)getModel()->treeColumn() ) { @@ -266,9 +266,9 @@ UIWidget* UITreeView::updateCell( const Vector2& posIndex, const ModelInd Float indentation = minIndent + getIndentWidth() * indentLevel; - hasChilds = getModel()->hasChilds( index ); + hasChildren = getModel()->hasChildren( index ); - if ( hasChilds ) { + if ( hasChildren ) { UIIcon* icon = getIndexMetadata( index ).open ? mExpandIcon : mContractIcon; Drawable* drawable = icon ? icon->getSize( mExpanderIconSize ) : nullptr; @@ -288,7 +288,7 @@ UIWidget* UITreeView::updateCell( const Vector2& posIndex, const ModelInd tcell->setIndentation( indentation ); } - if ( hasChilds && mExpandersAsIcons && cell->hasIcon() ) { + if ( hasChildren && mExpandersAsIcons && cell->hasIcon() ) { cell->getIcon()->setVisible( false ); return widget; } @@ -344,7 +344,7 @@ struct DrawTraverseTreeVars { Float rowHeight = 0; }; -void UITreeView::drawChilds() { +void UITreeView::drawChildren() { DrawTraverseTreeVars v{ this, 0, 0, getRowHeight() }; // To avoid allocating the lambda traverseTree( [this, &v]( const int&, const ModelIndex& index, const size_t& indentLevel, @@ -467,7 +467,7 @@ void UITreeView::setAllExpanded( const ModelIndex& index, bool expanded ) { for ( size_t i = 0; i < count; i++ ) { auto curIndex = model.index( i, model.treeColumn(), index ); getIndexMetadata( curIndex ).open = expanded; - if ( model.hasChilds( curIndex ) ) + if ( model.hasChildren( curIndex ) ) setAllExpanded( curIndex, expanded ); } } @@ -556,7 +556,7 @@ Uint32 UITreeView::onKeyDown( const KeyEvent& event ) { return UIAbstractTableView::onKeyDown( event ); auto curIndex = getSelection().first(); - if ( nullptr == getModel() || !getModel()->hasChilds() ) + if ( nullptr == getModel() || !getModel()->hasChildren() ) return UIAbstractTableView::onKeyDown( event ); switch ( event.getKeyCode() ) { @@ -766,7 +766,7 @@ ModelIndex UITreeView::findRowWithText( const std::string& text, const bool& cas const Model* model = getModel(); ConditionalLock l( getModel() != nullptr, getModel() ? &const_cast( getModel() )->resourceMutex() : nullptr ); - if ( !model || !model->hasChilds() ) + if ( !model || !model->hasChildren() ) return {}; ModelIndex foundIndex = {}; traverseTree( [&]( const int&, const ModelIndex& index, const size_t&, const Float& ) { @@ -787,7 +787,7 @@ ModelIndex UITreeView::findRowWithText( const std::string& text, const bool& cas ModelIndex UITreeView::openRowWithPath( const std::vector& pathTree, bool selectOpenedRow ) { const Model* model = getModel(); - if ( !model || !model->hasChilds() ) + if ( !model || !model->hasChildren() ) return {}; ModelIndex parentIndex = {}; for ( size_t i = 0; i < pathTree.size(); i++ ) { diff --git a/src/eepp/ui/uiviewpager.cpp b/src/eepp/ui/uiviewpager.cpp index d43be51f7..d0b7de4b3 100644 --- a/src/eepp/ui/uiviewpager.cpp +++ b/src/eepp/ui/uiviewpager.cpp @@ -29,10 +29,10 @@ UIViewPager::UIViewPager() : mCurrentPage( 0 ), mTotalPages( 0 ), mTimingFunction( Ease::Interpolation::SineIn ) { - mFlags |= UI_OWNS_CHILDS_POSITION; + mFlags |= UI_OWNS_CHILDREN_POSITION; mContainer = UIWidget::New(); mContainer->setParent( this ); - mContainer->setFlags( UI_OWNS_CHILDS_POSITION ); + mContainer->setFlags( UI_OWNS_CHILDREN_POSITION ); setClipType( ClipType::ContentBox ); } diff --git a/src/eepp/ui/uiwidget.cpp b/src/eepp/ui/uiwidget.cpp index cfe129834..7e2442803 100644 --- a/src/eepp/ui/uiwidget.cpp +++ b/src/eepp/ui/uiwidget.cpp @@ -1041,7 +1041,7 @@ void UIWidget::pushState( const Uint32& State, bool emitEvent ) { mSkinState->pushState( State ); if ( NULL != mStyle ) { - if ( !( State == UIState::StateHover && !isMouseOverMeOrChilds() ) ) { + if ( !( State == UIState::StateHover && !isMouseOverMeOrChildren() ) ) { updatePseudoClasses(); mStyle->pushState( State ); } @@ -1063,7 +1063,7 @@ void UIWidget::popState( const Uint32& State, bool emitEvent ) { mSkinState->popState( State ); if ( NULL != mStyle ) { - if ( !( State == UIState::StateHover && isMouseOverMeOrChilds() ) ) { + if ( !( State == UIState::StateHover && isMouseOverMeOrChildren() ) ) { updatePseudoClasses(); mStyle->popState( State ); } @@ -1739,7 +1739,7 @@ bool UIWidget::applyProperty( const StyleSheetProperty& attribute ) { notifyLayoutAttrChange(); } else if ( "reportsizechangetochilds" == cur || "report_size_change_to_childs" == cur ) { - enableReportSizeChangeToChilds(); + enableReportSizeChangeToChildren(); } } } diff --git a/src/eepp/ui/uiwidgettable.cpp b/src/eepp/ui/uiwidgettable.cpp index a99768db3..0d17899a1 100644 --- a/src/eepp/ui/uiwidgettable.cpp +++ b/src/eepp/ui/uiwidgettable.cpp @@ -646,8 +646,8 @@ void UIWidgetTable::onTouchDragValueChange( Vector2f diff ) { } bool UIWidgetTable::isTouchOverAllowedChilds() { - return isMouseOverMeOrChilds() && !mVScrollBar->isMouseOverMeOrChilds() && - !mHScrollBar->isMouseOverMeOrChilds(); + return isMouseOverMeOrChildren() && !mVScrollBar->isMouseOverMeOrChildren() && + !mHScrollBar->isMouseOverMeOrChildren(); } void UIWidgetTable::updatePageStep() { diff --git a/src/eepp/ui/uiwindow.cpp b/src/eepp/ui/uiwindow.cpp index 7ff07fd4f..69643b790 100644 --- a/src/eepp/ui/uiwindow.cpp +++ b/src/eepp/ui/uiwindow.cpp @@ -69,7 +69,7 @@ UIWindow::UIWindow( UIWindow::WindowBaseContainerType type, const StyleConfig& w mUISceneNode->setIsLoading( true ); mNodeFlags |= NODE_FLAG_WINDOW | NODE_FLAG_VIEW_DIRTY; - mFlags |= UI_OWNS_CHILDS_POSITION; + mFlags |= UI_OWNS_CHILDREN_POSITION; setHorizontalAlign( UI_HALIGN_CENTER ); @@ -99,7 +99,7 @@ UIWindow::UIWindow( UIWindow::WindowBaseContainerType type, const StyleConfig& w mContainer->writeNodeFlag( NODE_FLAG_OWNED_BY_NODE, 1 ); mContainer->setParent( this ); mContainer->setClipType( ClipType::ContentBox ); - mContainer->enableReportSizeChangeToChilds(); + mContainer->enableReportSizeChangeToChildren(); mContainer->addEventListener( Event::OnPositionChange, [this]( auto event ) { onContainerPositionChange( event ); } ); @@ -166,7 +166,7 @@ void UIWindow::updateWinFlags() { eeSAFE_DELETE( mFrameBuffer ); } - if ( NULL != mContainer && ( mStyleConfig.WinFlags & UI_WIN_DRAGABLE_CONTAINER ) ) { + if ( NULL != mContainer && ( mStyleConfig.WinFlags & UI_WIN_DRAGGABLE_CONTAINER ) ) { mContainer->setDragEnabled( true ); } else { setDragEnabled( false ); @@ -312,7 +312,7 @@ void UIWindow::updateWinFlags() { if ( NULL != mTitle ) mTitle->setVisible( false ); - fixChildsSize(); + fixChildrenSize(); } updateDrawInvalidator( true ); @@ -439,7 +439,7 @@ void UIWindow::drawShadow() { } void UIWindow::onPaddingChange() { - fixChildsSize(); + fixChildrenSize(); UIWidget::onPaddingChange(); } @@ -563,7 +563,7 @@ void UIWindow::setTheme( UITheme* Theme ) { calcMinWinSize(); } - fixChildsSize(); + fixChildrenSize(); onThemeLoaded(); } @@ -619,7 +619,7 @@ void UIWindow::onSizeChange() { setSize( Sizef( getSize().getWidth(), mStyleConfig.MinWindowSize.getHeight() ) ); } } else { - fixChildsSize(); + fixChildrenSize(); if ( ownsFrameBuffer() && NULL != mFrameBuffer && ( mFrameBuffer->getWidth() < mSize.getWidth() || @@ -670,7 +670,7 @@ const Sizef& UIWindow::getSize() const { return UIWidget::getSize(); } -void UIWindow::fixChildsSize() { +void UIWindow::fixChildrenSize() { Sizef size( PixelDensity::dpToPx( getMinWindowSizeWithDecoration() ) ); if ( mSize.getWidth() < size.getWidth() || mSize.getHeight() < size.getHeight() ) { @@ -1156,7 +1156,7 @@ UIWindow* UIWindow::showWhenReady() { } void UIWindow::onAlphaChange() { - if ( mStyleConfig.WinFlags & UI_WIN_SHARE_ALPHA_WITH_CHILDS ) { + if ( mStyleConfig.WinFlags & UI_WIN_SHARE_ALPHA_WITH_CHILDREN ) { Node* CurChild = mChild; while ( NULL != CurChild ) { @@ -1178,7 +1178,7 @@ void UIWindow::onChildCountChange( Node* child, const bool& removed ) { } void UIWindow::onPositionChange() { - // Invalidate the buffer since a position change can get childs into a drawable position + // Invalidate the buffer since a position change can get children into a drawable position // (on screen), when the drawable could have been outside the viewport and not drawn in the // previous position. invalidate( this ); @@ -1306,7 +1306,7 @@ void UIWindow::nodeDraw() { draw(); - drawChilds(); + drawChildren(); smartClipEnd( ClipType::PaddingBox ); @@ -1522,7 +1522,7 @@ UIWidget* UIWindow::getModalWidget() const { void UIWindow::resizeCursor() { UISceneNode* sceneNode = getUISceneNode(); - if ( NULL == sceneNode || !isMouseOverMeOrChilds() || !sceneNode->getUseGlobalCursors() || + if ( NULL == sceneNode || !isMouseOverMeOrChildren() || !sceneNode->getUseGlobalCursors() || ( mStyleConfig.WinFlags & UI_WIN_NO_DECORATION ) || !isResizeable() ) return; @@ -1581,7 +1581,7 @@ std::string UIWindow::getWindowFlagsString() const { flags.push_back( "close" ); if ( getWinFlags() & UI_WIN_MAXIMIZE_BUTTON ) flags.push_back( "maximize" ); - if ( getWinFlags() & UI_WIN_DRAGABLE_CONTAINER ) + if ( getWinFlags() & UI_WIN_DRAGGABLE_CONTAINER ) flags.push_back( "draggable" ); if ( getWinFlags() & UI_WIN_SHADOW ) flags.push_back( "shadow" ); @@ -1591,7 +1591,7 @@ std::string UIWindow::getWindowFlagsString() const { flags.push_back( "borderless" ); if ( getWinFlags() & UI_WIN_RESIZEABLE ) flags.push_back( "resizeable" ); - if ( getWinFlags() & UI_WIN_SHARE_ALPHA_WITH_CHILDS ) + if ( getWinFlags() & UI_WIN_SHARE_ALPHA_WITH_CHILDREN ) flags.push_back( "shareopacity" ); if ( getWinFlags() & UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS ) flags.push_back( "buttonactions" ); @@ -1683,7 +1683,7 @@ bool UIWindow::applyProperty( const StyleSheetProperty& attribute ) { break; case PropertyId::WindowButtonsOffset: mStyleConfig.ButtonsOffset = attribute.asDpDimensionVector2i( this ); - fixChildsSize(); + fixChildrenSize(); break; case PropertyId::WindowFlags: { std::string flagsStr = attribute.asString(); @@ -1704,7 +1704,7 @@ bool UIWindow::applyProperty( const StyleSheetProperty& attribute ) { else if ( "minimize" == cur ) winflags |= UI_WIN_MINIMIZE_BUTTON; else if ( "draggable" == cur ) - winflags |= UI_WIN_DRAGABLE_CONTAINER; + winflags |= UI_WIN_DRAGGABLE_CONTAINER; else if ( "shadow" == cur ) winflags |= UI_WIN_SHADOW; else if ( "modal" == cur ) @@ -1714,7 +1714,7 @@ bool UIWindow::applyProperty( const StyleSheetProperty& attribute ) { else if ( "resizeable" == cur ) winflags |= UI_WIN_RESIZEABLE; else if ( "shareopacity" == cur ) - winflags |= UI_WIN_SHARE_ALPHA_WITH_CHILDS; + winflags |= UI_WIN_SHARE_ALPHA_WITH_CHILDREN; else if ( "buttonactions" == cur ) winflags |= UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS; else if ( "framebuffer" == cur ) @@ -1736,31 +1736,31 @@ bool UIWindow::applyProperty( const StyleSheetProperty& attribute ) { case PropertyId::WindowTitlebarSize: mStyleConfig.TitlebarSize = attribute.asDpDimensionSizei( this ); mStyleConfig.TitlebarAutoSize = false; - fixChildsSize(); + fixChildrenSize(); break; case PropertyId::WindowBorderSize: mStyleConfig.BorderSize = attribute.asDpDimensionSizei( this ); mStyleConfig.BorderAutoSize = false; - fixChildsSize(); + fixChildrenSize(); break; case PropertyId::WindowMinSize: mStyleConfig.MinWindowSize = attribute.asDpDimensionSizef( this ); - fixChildsSize(); + fixChildrenSize(); break; case PropertyId::WindowButtonsSeparation: mStyleConfig.ButtonsSeparation = attribute.asDpDimensionUint( this ); - fixChildsSize(); + fixChildrenSize(); break; case PropertyId::WindowCornerDistance: mStyleConfig.MinCornerDistance = attribute.asDpDimensionI( this ); break; case PropertyId::WindowTitlebarAutoSize: mStyleConfig.TitlebarAutoSize = attribute.asBool(); - fixChildsSize(); + fixChildrenSize(); break; case PropertyId::WindowBorderAutoSize: mStyleConfig.BorderAutoSize = attribute.asBool(); - fixChildsSize(); + fixChildrenSize(); break; default: return UIWidget::applyProperty( attribute ); diff --git a/src/eepp/window/input.cpp b/src/eepp/window/input.cpp index 57e5827e6..6900a32aa 100644 --- a/src/eepp/window/input.cpp +++ b/src/eepp/window/input.cpp @@ -22,7 +22,7 @@ Input::Input( EE::Window::Window* window, JoystickManager* joystickmanager ) : mTClick( 0 ), mNumCallBacks( 0 ), mMouseSpeed( 1.0f ), - mInputGrabed( false ) { + mInputGrabbed( false ) { memset( mScancodeDown, 0, EE_KEYS_SPACE ); memset( mScancodeUp, 0, EE_KEYS_SPACE ); } @@ -87,7 +87,7 @@ void Input::processEvent( InputEvent* Event ) { break; } case InputEvent::MouseMotion: { - if ( !mInputGrabed ) { + if ( !mInputGrabbed ) { mMousePos.x = Event->motion.x; mMousePos.y = Event->motion.y; } else { diff --git a/src/eepp/window/window.cpp b/src/eepp/window/window.cpp index b76bf364f..8ec036084 100644 --- a/src/eepp/window/window.cpp +++ b/src/eepp/window/window.cpp @@ -521,7 +521,7 @@ const std::string& Window::getTitle() const { return mWindow.WindowConfig.Title; } -eeWindowContex Window::getContext() const { +eeWindowContext Window::getContext() const { #if defined( EE_GLEW_AVAILABLE ) && \ ( EE_PLATFORM == EE_PLATFORM_WIN || defined( EE_X11_PLATFORM ) || \ EE_PLATFORM == EE_PLATFORM_MACOS ) @@ -567,7 +567,7 @@ Vector2i Window::getPosition() const { return Vector2i::Zero; } -void Window::setCurrentContext( eeWindowContex ) {} +void Window::setCurrentContext( eeWindowContext ) {} void Window::setCurrent() {} diff --git a/src/modules/eterm/include/eterm/terminal/terminaldisplay.hpp b/src/modules/eterm/include/eterm/terminal/terminaldisplay.hpp index 81214a2fb..281a62f9e 100644 --- a/src/modules/eterm/include/eterm/terminal/terminaldisplay.hpp +++ b/src/modules/eterm/include/eterm/terminal/terminaldisplay.hpp @@ -304,7 +304,7 @@ class TerminalDisplay : public ITerminalDisplay { VertexBuffer* mVBForeground{ nullptr }; std::vector mVBStyles; TerminalColorScheme mColorScheme; - Uint32 mQuadVertexs{ 6 }; + Uint32 mQuadVertex{ 6 }; Primitives mPrimitives; Vector2u mCurGridPos; diff --git a/src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp b/src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp index 7f14dfdcc..da5f04c99 100644 --- a/src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp +++ b/src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp @@ -485,7 +485,7 @@ TerminalDisplay::TerminalDisplay( EE::Window::Window* window, Font* font, const Sizei gridSize( gridSizeFromTermDimensions( mFont, mFontSize, mSize - mPadding * 2.f ) ); mDirtyLines.resize( gridSize.getHeight(), 1 ); - mQuadVertexs = GLi->quadVertexs(); + mQuadVertex = GLi->quadVertex(); if ( mUseFrameBuffer ) createFrameBuffer(); @@ -1752,8 +1752,8 @@ void TerminalDisplay::drawFrameBuffer() { VertexBuffer* TerminalDisplay::createRowVBO( bool usesTexCoords ) { auto* VBO = VertexBuffer::New( usesTexCoords ? VERTEX_FLAGS_DEFAULT : VERTEX_FLAGS_PRIMITIVE, - mQuadVertexs == 6 ? EE::Graphics::PRIMITIVE_TRIANGLES : EE::Graphics::PRIMITIVE_QUADS, - mRows * mColumns * mQuadVertexs, 0, VertexBufferUsageType::Stream ); + mQuadVertex == 6 ? EE::Graphics::PRIMITIVE_TRIANGLES : EE::Graphics::PRIMITIVE_QUADS, + mRows * mColumns * mQuadVertex, 0, VertexBufferUsageType::Stream ); VBO->setGridSize( Sizei( mColumns, 1 ) ); return VBO; } @@ -1762,13 +1762,13 @@ void TerminalDisplay::createVBO( VertexBuffer** vbo, bool usesTexCoords ) { eeSAFE_DELETE( ( *vbo ) ); ( *vbo ) = VertexBuffer::New( usesTexCoords ? VERTEX_FLAGS_DEFAULT : VERTEX_FLAGS_PRIMITIVE, - mQuadVertexs == 6 ? EE::Graphics::PRIMITIVE_TRIANGLES : EE::Graphics::PRIMITIVE_QUADS, - mRows * mColumns * mQuadVertexs, 0, VertexBufferUsageType::Stream ); - ( *vbo )->resizeArray( VERTEX_FLAG_POSITION, mRows * mColumns * mQuadVertexs ); - ( *vbo )->resizeArray( VERTEX_FLAG_COLOR, mRows * mColumns * mQuadVertexs ); + mQuadVertex == 6 ? EE::Graphics::PRIMITIVE_TRIANGLES : EE::Graphics::PRIMITIVE_QUADS, + mRows * mColumns * mQuadVertex, 0, VertexBufferUsageType::Stream ); + ( *vbo )->resizeArray( VERTEX_FLAG_POSITION, mRows * mColumns * mQuadVertex ); + ( *vbo )->resizeArray( VERTEX_FLAG_COLOR, mRows * mColumns * mQuadVertex ); ( *vbo )->setGridSize( Sizei( mColumns, mRows ) ); if ( usesTexCoords ) - ( *vbo )->resizeArray( VERTEX_FLAG_TEXTURE0, mRows * mColumns * mQuadVertexs ); + ( *vbo )->resizeArray( VERTEX_FLAG_TEXTURE0, mRows * mColumns * mQuadVertex ); } void TerminalDisplay::initVBOs() { diff --git a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ocaml.cpp b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ocaml.cpp index 712df713a..f23e444b7 100644 --- a/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ocaml.cpp +++ b/src/modules/languages-syntax-highlighting/src/eepp/ui/doc/languages/ocaml.cpp @@ -29,7 +29,7 @@ SyntaxDefinition& addOCaml() { { { "and", "keyword" }, { "as", "keyword" }, { "asr", "operator" }, { "assert", "keyword" }, { "begin", "keyword" }, { "class", "keyword" }, - { "constaint", "keyword" }, { "do", "keyword" }, { "done", "keyword" }, + { "constraint", "keyword" }, { "do", "keyword" }, { "done", "keyword" }, { "downto", "keyword" }, { "else", "keyword" }, { "end", "keyword" }, { "exception", "keyword" }, { "external", "keyword" }, { "false", "literal" }, { "for", "keyword" }, { "fun", "keyword" }, { "function", "keyword" }, diff --git a/src/modules/maps/src/eepp/maps/mapeditor/mapeditor.cpp b/src/modules/maps/src/eepp/maps/mapeditor/mapeditor.cpp index c245fcf52..930c416cf 100644 --- a/src/modules/maps/src/eepp/maps/mapeditor/mapeditor.cpp +++ b/src/modules/maps/src/eepp/maps/mapeditor/mapeditor.cpp @@ -208,7 +208,7 @@ void MapEditor::createMenuBar() { PU6->addEventListener( Event::OnItemClicked, [this]( auto event ) { mapMenuClick( event ); } ); mWinContainer = UIWidget::New(); - mWinContainer->enableReportSizeChangeToChilds(); + mWinContainer->enableReportSizeChangeToChildren(); mWinContainer->setParent( mUIContainer ); mWinContainer->setPosition( 0, MenuBar->getSize().getHeight() ); mWinContainer->setSize( mUIContainer->getSize().getWidth(), @@ -1276,7 +1276,7 @@ void MapEditor::mapMenuClick( const Event* Event ) { UIWindow* tWin = UIWindow::New(); tWin->setSizeWithDecoration( 1024, 768 ); tWin->setWindowFlags( UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | - UI_WIN_DRAGABLE_CONTAINER ); + UI_WIN_DRAGGABLE_CONTAINER ); tWin->setMinWindowSize( 1024, 768 ); eeNew( Tools::TextureAtlasEditor, ( tWin ) ); diff --git a/src/modules/maps/src/eepp/maps/mapeditor/uimapnew.cpp b/src/modules/maps/src/eepp/maps/mapeditor/uimapnew.cpp index a4fa986ad..a5ed55dd0 100644 --- a/src/modules/maps/src/eepp/maps/mapeditor/uimapnew.cpp +++ b/src/modules/maps/src/eepp/maps/mapeditor/uimapnew.cpp @@ -39,7 +39,7 @@ UIMapNew::UIMapNew( UIMap* Map, std::function NewMapCb, bool ResizeMap ) mUIWindow = UIWindow::New(); mUIWindow->setSizeWithDecoration( 320, 380 ) ->setWindowFlags( UI_WIN_CLOSE_BUTTON | UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS | - UI_WIN_SHARE_ALPHA_WITH_CHILDS | UI_WIN_MODAL ) + UI_WIN_SHARE_ALPHA_WITH_CHILDREN | UI_WIN_MODAL ) ->setMinWindowSize( 320, 380 ); mUIWindow->addEventListener( Event::OnWindowClose, diff --git a/src/tests/test_all/test.cpp b/src/tests/test_all/test.cpp index bcf9fa23b..78b8e3fcd 100644 --- a/src/tests/test_all/test.cpp +++ b/src/tests/test_all/test.cpp @@ -362,7 +362,7 @@ void EETest::createBaseUI() { UIWindow* tWin = UIWindow::New(); tWin->setSize( 530, 405 )->setPosition( 320, 240 ); UIWindow::StyleConfig windowStyleConfig = tWin->getStyleConfig(); - windowStyleConfig.WinFlags = UI_WIN_DRAGABLE_CONTAINER | UI_WIN_SHADOW | UI_WIN_FRAME_BUFFER; + windowStyleConfig.WinFlags = UI_WIN_DRAGGABLE_CONTAINER | UI_WIN_SHADOW | UI_WIN_FRAME_BUFFER; windowStyleConfig.MinWindowSize = Sizef( 530, 405 ); windowStyleConfig.BaseAlpha = 200; tWin->setStyleConfig( windowStyleConfig ); @@ -1006,7 +1006,7 @@ void EETest::createMapEditor() { tWin->setSizeWithDecoration( 1024, 768 )->setPosition( 0, 0 ); UIWindow::StyleConfig windowStyleConfig = tWin->getStyleConfig(); windowStyleConfig.WinFlags = UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | - UI_WIN_DRAGABLE_CONTAINER | UI_WIN_SHADOW | UI_WIN_FRAME_BUFFER; + UI_WIN_DRAGGABLE_CONTAINER | UI_WIN_SHADOW | UI_WIN_FRAME_BUFFER; windowStyleConfig.MinWindowSize = tWin->getSizeWithoutDecoration(); tWin->setStyleConfig( windowStyleConfig ); @@ -1026,7 +1026,7 @@ void EETest::createETGEditor() { tWin->setSizeWithDecoration( 1024, 768 )->setPosition( 0, 0 ); UIWindow::StyleConfig windowStyleConfig = tWin->getStyleConfig(); windowStyleConfig.WinFlags = UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | - UI_WIN_DRAGABLE_CONTAINER | UI_WIN_SHADOW | UI_WIN_FRAME_BUFFER; + UI_WIN_DRAGGABLE_CONTAINER | UI_WIN_SHADOW | UI_WIN_FRAME_BUFFER; windowStyleConfig.MinWindowSize = tWin->getSizeWithoutDecoration(); tWin->setStyleConfig( windowStyleConfig ); diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp index a61a75682..2b199bf22 100644 --- a/src/tools/ecode/ecode.cpp +++ b/src/tools/ecode/ecode.cpp @@ -2056,7 +2056,7 @@ void App::createDocDirtyAlert( UICodeEditor* editor, bool showEnableAutoReload ) )xml"; docAlert = mUISceneNode->loadLayoutFromString( msg, editor )->asType(); - editor->enableReportSizeChangeToChilds(); + editor->enableReportSizeChangeToChildren(); docAlert->find( "file_autoreload" ) ->setVisible( showEnableAutoReload ? !editor->getDocument().isDirty() : false ) @@ -2117,7 +2117,7 @@ void App::createDocDoesNotExistsInFSAlert( UICodeEditor* editor ) { )xml"; docAlert = mUISceneNode->loadLayoutFromString( msg, editor )->asType(); - editor->enableReportSizeChangeToChilds(); + editor->enableReportSizeChangeToChildren(); docAlert->find( "file_continue_editing" )->onClick( [docAlert, editor]( const MouseEvent* ) { editor->disableReportSizeChangeToChilds(); @@ -2186,7 +2186,7 @@ void App::createDocManyLangsAlert( UICodeEditor* editor ) { } ); } - editor->enableReportSizeChangeToChilds(); + editor->enableReportSizeChangeToChildren(); docAlert->runOnMainThread( [docAlert, editor] { @@ -4269,7 +4269,7 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) { args::Flag terminal( parser, "terminal", "Open a new terminal / Open ecode in terminal mode", { 't', "terminal" } ); args::MapFlag logLevel( - parser, "log-level", "The level of details that the application will emmit logs.", + parser, "log-level", "The level of details that the application will emit logs.", { 'l', "log-level" }, Log::getMapFlag(), Log::getDefaultLogLevel() ); args::Flag fb( parser, "framebuffer", "Use frame buffer (more memory usage, less CPU usage)", { "fb", "framebuffer" } ); diff --git a/src/tools/ecode/plugins/debugger/dap/debuggerclientdap.cpp b/src/tools/ecode/plugins/debugger/dap/debuggerclientdap.cpp index a5f5c9c11..20665a73a 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 emmited + // We cannot destroy the Bus yet, since the async read from the socket might have emited // this termination. if ( session.mapped().bus ) { session.mapped().bus->close(); diff --git a/src/tools/ecode/plugins/debugger/debuggerplugin.cpp b/src/tools/ecode/plugins/debugger/debuggerplugin.cpp index f983b7dd9..be3f59cfb 100644 --- a/src/tools/ecode/plugins/debugger/debuggerplugin.cpp +++ b/src/tools/ecode/plugins/debugger/debuggerplugin.cpp @@ -2367,7 +2367,7 @@ void DebuggerPlugin::displayTooltip( UICodeEditor* editor, const std::string& ex win->getKeyBindings().addKeybind( { KEY_ESCAPE }, "closeWindow" ); win->setWindowFlags( UI_WIN_CLOSE_BUTTON | UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS | UI_WIN_SHADOW | UI_WIN_EPHEMERAL | UI_WIN_RESIZEABLE | - UI_WIN_DRAGABLE_CONTAINER | UI_WIN_SHARE_ALPHA_WITH_CHILDS ); + UI_WIN_DRAGGABLE_CONTAINER | UI_WIN_SHARE_ALPHA_WITH_CHILDREN ); win->center(); win->on( Event::OnWindowClose, [this]( auto ) { mHoverTooltip = nullptr; } ); win->on( Event::OnWindowReady, [win]( auto ) { win->setFocus(); } ); diff --git a/src/tools/ecode/plugins/debugger/models/variablesmodel.cpp b/src/tools/ecode/plugins/debugger/models/variablesmodel.cpp index b50e4fe37..67d25c1c7 100644 --- a/src/tools/ecode/plugins/debugger/models/variablesmodel.cpp +++ b/src/tools/ecode/plugins/debugger/models/variablesmodel.cpp @@ -121,7 +121,7 @@ size_t VariablesModel::rowCount( const ModelIndex& index ) const { return static_cast( parentNode->getChildren().size() ); } -bool VariablesModel::hasChilds( const ModelIndex& index ) const { +bool VariablesModel::hasChildren( const ModelIndex& index ) const { if ( !index.isValid() ) return !mRootNode->children.empty(); ModelVariableNode* node = static_cast( index.internalData() ); diff --git a/src/tools/ecode/plugins/debugger/models/variablesmodel.hpp b/src/tools/ecode/plugins/debugger/models/variablesmodel.hpp index b243f7ddf..b6b4f28b5 100644 --- a/src/tools/ecode/plugins/debugger/models/variablesmodel.hpp +++ b/src/tools/ecode/plugins/debugger/models/variablesmodel.hpp @@ -111,7 +111,7 @@ class VariablesModel : public Model { size_t rowCount( const ModelIndex& index = ModelIndex() ) const override; - bool hasChilds( const ModelIndex& index = ModelIndex() ) const override; + bool hasChildren( const ModelIndex& index = ModelIndex() ) const override; size_t columnCount( const ModelIndex& ) const override; diff --git a/src/tools/ecode/plugins/linter/linterplugin.cpp b/src/tools/ecode/plugins/linter/linterplugin.cpp index 8503abdae..772508bf1 100644 --- a/src/tools/ecode/plugins/linter/linterplugin.cpp +++ b/src/tools/ecode/plugins/linter/linterplugin.cpp @@ -1195,11 +1195,15 @@ void LinterPlugin::goToNextError( UICodeEditor* editor ) { Lock l( mMatchesMutex ); auto fMatch = mMatches.find( doc ); - if ( fMatch == mMatches.end() ) + if ( fMatch == mMatches.end() ) { + doc->execute( "spellchecker-go-to-next-error", editor ); return; + } const auto& matches = fMatch->second; - if ( matches.empty() ) + if ( matches.empty() ) { + doc->execute( "spellchecker-go-to-next-error", editor ); return; + } const LinterMatch* matched = nullptr; for ( const auto& match : matches ) { @@ -1262,11 +1266,15 @@ void LinterPlugin::goToPrevError( UICodeEditor* editor ) { Lock l( mMatchesMutex ); auto fMatch = mMatches.find( doc ); - if ( fMatch == mMatches.end() ) + if ( fMatch == mMatches.end() ) { + doc->execute( "spellchecker-go-to-previous-error", editor ); return; + } auto& matches = fMatch->second; - if ( matches.empty() ) + if ( matches.empty() ) { + doc->execute( "spellchecker-go-to-previous-error", editor ); return; + } const LinterMatch* matched = nullptr; for ( auto match = matches.rbegin(); match != matches.rend(); ++match ) { diff --git a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp index 06252ef24..8a024c451 100644 --- a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp +++ b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp @@ -1328,11 +1328,14 @@ void LSPClientPlugin::codeAction( UICodeEditor* editor ) { if ( resp.isResponse() ) diagnostics = std::move( resp.getResponse().data ); - mClientManager.codeAction( + bool sent = mClientManager.codeAction( editor->getDocumentRef(), diagnostics, [this, editor]( const LSPClientServer::IdType&, const std::vector& res ) { createCodeActionsView( editor, res ); } ); + + if ( !sent ) + editor->getDocument().execute( "spellchecker-fix-typo", editor ); } void LSPClientPlugin::renameSymbol( UICodeEditor* editor ) { diff --git a/src/tools/ecode/plugins/lsp/lspclientserver.cpp b/src/tools/ecode/plugins/lsp/lspclientserver.cpp index c7de0da03..d25c6c212 100644 --- a/src/tools/ecode/plugins/lsp/lspclientserver.cpp +++ b/src/tools/ecode/plugins/lsp/lspclientserver.cpp @@ -728,8 +728,9 @@ static json codeActionParams( const URI& document, const TextRange& range, context[MEMBER_DIAGNOSTICS] = diags; if ( !kinds.empty() ) context["only"] = json( kinds ); - if ( !diagnostics.empty() ) - params["context"] = diagnostics; + params["context"] = !diagnostics.empty() + ? diagnostics + : nlohmann::json{ { "diagnostics", nlohmann::json::array() } }; return params; } @@ -1478,7 +1479,7 @@ LSPClientServer::LSPRequestHandle LSPClientServer::write( json&& msg, const Json if ( mSocket ) { size_t sent = 0; mSocket->send( sjson.c_str(), sjson.size(), sent ); - } else if ( !mProcess.isShuttingDown() && mProcess.isAlive() ) { + } else if ( !mProcess.isShuttingDown() && mProcess.isAlive() ) { mProcess.write( sjson ); } } else { diff --git a/src/tools/ecode/plugins/lsp/lspclientservermanager.cpp b/src/tools/ecode/plugins/lsp/lspclientservermanager.cpp index 5e266d3c6..a4abc4ab1 100644 --- a/src/tools/ecode/plugins/lsp/lspclientservermanager.cpp +++ b/src/tools/ecode/plugins/lsp/lspclientservermanager.cpp @@ -440,12 +440,12 @@ void LSPClientServerManager::getSymbolReferences( std::shared_ptr } ); } -void LSPClientServerManager::codeAction( std::shared_ptr doc, +bool LSPClientServerManager::codeAction( std::shared_ptr doc, const nlohmann::json& diagnostics, const LSPClientServer::CodeActionHandler& h ) { auto* server = getOneLSPClientServer( doc ); - if ( !server ) - return; + if ( !server || !server->isRunning() ) + return false; auto range = doc->getSelection(); if ( !diagnostics.empty() && diagnostics.contains( "diagnostics" ) && @@ -458,6 +458,7 @@ void LSPClientServerManager::codeAction( std::shared_ptr doc, } server->documentCodeAction( doc->getURI(), range, {}, diagnostics, h ); + return true; } void LSPClientServerManager::memoryUsage( std::shared_ptr doc ) { diff --git a/src/tools/ecode/plugins/lsp/lspclientservermanager.hpp b/src/tools/ecode/plugins/lsp/lspclientservermanager.hpp index 16f8f1e24..ca37b5f74 100644 --- a/src/tools/ecode/plugins/lsp/lspclientservermanager.hpp +++ b/src/tools/ecode/plugins/lsp/lspclientservermanager.hpp @@ -72,7 +72,7 @@ class LSPClientServerManager { void getSymbolReferences( std::shared_ptr doc ); - void codeAction( std::shared_ptr doc, const nlohmann::json& diagnostics, + bool codeAction( std::shared_ptr doc, const nlohmann::json& diagnostics, const LSPClientServer::CodeActionHandler& h ); void memoryUsage( std::shared_ptr doc ); diff --git a/src/tools/ecode/plugins/spellchecker/spellcheckerplugin.cpp b/src/tools/ecode/plugins/spellchecker/spellcheckerplugin.cpp index 6359e7a20..adcdd2a31 100644 --- a/src/tools/ecode/plugins/spellchecker/spellcheckerplugin.cpp +++ b/src/tools/ecode/plugins/spellchecker/spellcheckerplugin.cpp @@ -82,12 +82,13 @@ void SpellCheckerPlugin::load( PluginManager* pluginManager ) { } if ( mKeyBindings.empty() ) { - mKeyBindings["spellchecker-fix-typo"] = "alt+return"; + mKeyBindings["spellchecker-fix-typo"] = "alt+shift+return"; } if ( j.contains( "keybindings" ) ) { auto& kb = j["keybindings"]; - auto list = { "spellchecker-fix-typo" }; + auto list = { "spellchecker-fix-typo", "spellchecker-go-to-next-error", + "spellchecker-go-to-previous-error" }; for ( const auto& key : list ) { if ( kb.contains( key ) ) { if ( !kb[key].empty() ) @@ -121,9 +122,97 @@ void SpellCheckerPlugin::onRegisterDocument( TextDocument* doc ) { doc->setCommand( "spellchecker-fix-typo", [this]( TextDocument::Client* client ) { createSpellCheckAlternativesView( static_cast( client ) ); } ); + + doc->setCommand( "spellchecker-go-to-next-error", [this]( TextDocument::Client* client ) { + goToNextError( static_cast( client ) ); + } ); + + doc->setCommand( "spellchecker-go-to-previous-error", [this]( TextDocument::Client* client ) { + goToPrevError( static_cast( client ) ); + } ); + setDocDirty( doc ); } +void SpellCheckerPlugin::goToNextError( UICodeEditor* editor ) { + if ( nullptr == editor || !editor->hasDocument() ) + return; + TextDocument* doc = &editor->getDocument(); + auto pos = doc->getSelection().start(); + + Lock l( mMatchesMutex ); + auto fMatch = mMatches.find( doc ); + if ( fMatch == mMatches.end() ) + return; + const auto& matches = fMatch->second; + if ( matches.empty() ) + return; + + const SpellCheckerMatch* matched = nullptr; + for ( const auto& match : matches ) { + if ( match.first >= pos.line() ) { + for ( const auto& m : match.second ) { + if ( pos < m.range.normalized().start() ) { + matched = &m; + break; + } + } + if ( matched ) + break; + } + } + + if ( matched != nullptr ) { + editor->goToLine( matched->range.start() ); + mManager->getSplitter()->addCurrentPositionToNavigationHistory(); + return; + } else if ( matches.begin()->second.front().range.start().line() != pos.line() ) { + editor->goToLine( matches.begin()->second.front().range.start() ); + mManager->getSplitter()->addCurrentPositionToNavigationHistory(); + return; + } +} + +void SpellCheckerPlugin::goToPrevError( UICodeEditor* editor ) { + if ( nullptr == editor || !editor->hasDocument() ) + return; + TextDocument* doc = &editor->getDocument(); + auto pos = doc->getSelection().start(); + + Lock l( mMatchesMutex ); + auto fMatch = mMatches.find( doc ); + if ( fMatch == mMatches.end() ) + return; + auto& matches = fMatch->second; + if ( matches.empty() ) + return; + + const SpellCheckerMatch* matched = nullptr; + for ( auto match = matches.rbegin(); match != matches.rend(); ++match ) { + if ( match->first <= pos.line() ) { + for ( auto it = match->second.rbegin(); it != match->second.rend(); ++it ) { + const auto& m = *it; + if ( m.range.normalized().start() < pos ) { + matched = &m; + break; + } + } + if ( matched ) + break; + } + } + + if ( matched != nullptr ) { + editor->goToLine( matched->range.start() ); + mManager->getSplitter()->addCurrentPositionToNavigationHistory(); + return; + } else if ( matches.rbegin()->second.front().range.start().line() != pos.line() ) { + editor->goToLine( matches.rbegin()->second.front().range.start() ); + mManager->getSplitter()->addCurrentPositionToNavigationHistory(); + return; + } +} + void SpellCheckerPlugin::onUnregisterDocument( TextDocument* doc ) { mDirtyDoc.erase( doc ); } @@ -184,17 +273,8 @@ void SpellCheckerPlugin::spellCheckDoc( std::shared_ptr doc ) { IOStreamString fileString; mClock.restart(); if ( doc->isDirty() || !doc->hasFilepath() ) { - std::string tmpPath; - if ( !doc->hasFilepath() ) { - tmpPath = - Sys::getTempPath() + ".ecode-" + doc->getFilename() + "." + String::randString( 8 ); - } else { - tmpPath = Sys::getTempPath() + doc->getFilename(); - if ( FileSystem::fileExists( tmpPath ) ) { - tmpPath = Sys::getTempPath() + ".ecode-" + doc->getFilename() + "." + - String::randString( 8 ); - } - } + std::string tmpPath = + Sys::getTempPath() + ".ecode-" + doc->getFilename() + "." + String::randString( 8 ); doc->save( fileString, true ); FileSystem::fileWrite( tmpPath, (Uint8*)fileString.getStreamPointer(), @@ -246,7 +326,7 @@ void SpellCheckerPlugin::runSpellChecker( std::shared_ptr doc, return; } - if ( 0 != returnCode ) { + if ( 0 != returnCode && 2 != returnCode ) { Lock matchesLock( mMatchesMutex ); std::map> empty; setMatches( doc.get(), std::move( empty ) ); @@ -301,10 +381,10 @@ void SpellCheckerPlugin::runSpellChecker( std::shared_ptr doc, setMatches( doc.get(), std::move( matches ) ); - Log::info( "SpellCheckerPlugin::runSpellChecker with binary %s for %s took %.2fms. Found: " - "%d matches.", - SPELL_CHECKER_CMD, path, mClock.getElapsedTime().asMilliseconds(), - totalMatches ); + Log::debug( "SpellCheckerPlugin::runSpellChecker with binary %s for %s took %.2fms. Found: " + "%d matches.", + SPELL_CHECKER_CMD, path, mClock.getElapsedTime().asMilliseconds(), + totalMatches ); } } diff --git a/src/tools/ecode/plugins/spellchecker/spellcheckerplugin.hpp b/src/tools/ecode/plugins/spellchecker/spellcheckerplugin.hpp index 7ab5bdab4..69cb87af1 100644 --- a/src/tools/ecode/plugins/spellchecker/spellcheckerplugin.hpp +++ b/src/tools/ecode/plugins/spellchecker/spellcheckerplugin.hpp @@ -105,6 +105,11 @@ class SpellCheckerPlugin : public PluginBase { void replaceMatchWithText( const TextRange& range, const std::string& newText, UICodeEditor* ); void createSpellCheckAlternativesView( UICodeEditor* editor ); + + void goToNextError( UICodeEditor* editor ); + + void goToPrevError( UICodeEditor* editor ); + }; } // namespace ecode diff --git a/src/tools/ecode/projectsearch.cpp b/src/tools/ecode/projectsearch.cpp index 025393008..937882a7f 100644 --- a/src/tools/ecode/projectsearch.cpp +++ b/src/tools/ecode/projectsearch.cpp @@ -39,7 +39,7 @@ static String textLine( const std::string& fileText, const size_t& fromPos, Int6 } relCol = String::utf8Length( fileText.substr( nlStartPtr - stringStartPtr, startPtr - nlStartPtr ) ); - // if the line to substract is massive we only get the fist kilobyte of that line, since the + // if the line to subtract is massive we only get the fist kilobyte of that line, since the // line is only shared for visual aid. return fileText.substr( nlStartPtr - stringStartPtr, endPtr - nlStartPtr > EE_1KB ? EE_1KB : endPtr - nlStartPtr ); @@ -239,7 +239,7 @@ ProjectSearch::find( const std::vector files, std::string string, } // if the file is not inverted and the file matches with the glob, then it must be - // not skiped + // not skipped if ( !filter.second && matches ) { skip = false; break; diff --git a/src/tools/ecode/settingsmenu.cpp b/src/tools/ecode/settingsmenu.cpp index aeae07391..dab4e7aa5 100644 --- a/src/tools/ecode/settingsmenu.cpp +++ b/src/tools/ecode/settingsmenu.cpp @@ -74,7 +74,7 @@ void SettingsMenu::createSettingsMenu( App* app, UIMenuBar* menuBar ) { ->add( i18n( "save_all", "Save All" ), findIcon( "document-save-as" ), getKeybind( "save-all" ) ) ->setId( "save-all" ); - mSettingsMenu->addSeparator()->setId( "settings-submenues-sep" ); + mSettingsMenu->addSeparator()->setId( "settings-submenus-sep" ); mProjectMenu = UIPopUpMenu::New(); auto projectMenuButton = mSettingsMenu @@ -206,7 +206,7 @@ void SettingsMenu::createSettingsMenu( App* app, UIMenuBar* menuBar ) { } UIMenu* SettingsMenu::createFileTypeMenu( bool emptyMenu ) { - mFileTypeMenuesCreatedWithHeight = emptyMenu ? 0 : mUISceneNode->getPixelsSize().getHeight(); + mFileTypeMenusCreatedWithHeight = emptyMenu ? 0 : mUISceneNode->getPixelsSize().getHeight(); size_t maxItems = 19; auto* dM = SyntaxDefinitionManager::instance(); auto names = dM->getLanguageNames(); @@ -222,18 +222,18 @@ UIMenu* SettingsMenu::createFileTypeMenu( bool emptyMenu ) { UIPopUpMenu* menu = UIPopUpMenu::New(); menu->on( Event::OnItemClicked, cb ); - mFileTypeMenues.push_back( menu ); + mFileTypeMenus.push_back( menu ); size_t total = 0; if ( emptyMenu ) - return mFileTypeMenues[0]; + return mFileTypeMenus[0]; for ( const auto& name : names ) { menu->addRadioButton( name, mSplitter->curEditorExistsAndFocused() && mSplitter->getCurEditor()->getSyntaxDefinition().getLanguageName() == name ); - if ( mFileTypeMenues.size() == 1 && menu->getCount() == 1 ) { + if ( mFileTypeMenus.size() == 1 && menu->getCount() == 1 ) { auto menuBar = mUISceneNode->findByType( UI_TYPE_MENUBAR ); menu->reloadStyle( true, true ); Float height = menu->getPixelsSize().getHeight(); @@ -248,16 +248,16 @@ UIMenu* SettingsMenu::createFileTypeMenu( bool emptyMenu ) { UIPopUpMenu* newMenu = UIPopUpMenu::New(); menu->addSubMenu( i18n( "more_ellipsis", "More..." ), nullptr, newMenu ); newMenu->on( Event::OnItemClicked, cb ); - mFileTypeMenues.push_back( newMenu ); + mFileTypeMenus.push_back( newMenu ); menu = newMenu; } } - return mFileTypeMenues[0]; + return mFileTypeMenus[0]; } UIMenu* SettingsMenu::createColorSchemeMenu( bool emptyMenu ) { - mColorSchemeMenuesCreatedWithHeight = emptyMenu ? 0 : mUISceneNode->getPixelsSize().getHeight(); + mColorSchemeMenusCreatedWithHeight = emptyMenu ? 0 : mUISceneNode->getPixelsSize().getHeight(); size_t maxItems = 19; auto cb = [this]( const Event* event ) { UIMenuItem* item = event->getNode()->asType(); @@ -267,18 +267,18 @@ UIMenu* SettingsMenu::createColorSchemeMenu( bool emptyMenu ) { UIPopUpMenu* menu = UIPopUpMenu::New(); menu->on( Event::OnItemClicked, cb ); - mColorSchemeMenues.push_back( menu ); + mColorSchemeMenus.push_back( menu ); size_t total = 0; const auto& colorSchemes = mSplitter->getColorSchemes(); if ( emptyMenu ) - return mColorSchemeMenues[0]; + return mColorSchemeMenus[0]; for ( auto& colorScheme : colorSchemes ) { menu->addRadioButton( colorScheme.first, mSplitter->getCurrentColorSchemeName() == colorScheme.first ); - if ( mColorSchemeMenues.size() == 1 && menu->getCount() == 1 ) { + if ( mColorSchemeMenus.size() == 1 && menu->getCount() == 1 ) { auto menuBar = mUISceneNode->findByType( UI_TYPE_MENUBAR ); menu->reloadStyle( true, true ); Float height = menu->getPixelsSize().getHeight(); @@ -293,12 +293,12 @@ UIMenu* SettingsMenu::createColorSchemeMenu( bool emptyMenu ) { UIPopUpMenu* newMenu = UIPopUpMenu::New(); menu->addSubMenu( i18n( "more_ellipsis", "More..." ), nullptr, newMenu ); newMenu->on( Event::OnItemClicked, cb ); - mColorSchemeMenues.push_back( newMenu ); + mColorSchemeMenus.push_back( newMenu ); menu = newMenu; } } - return mColorSchemeMenues[0]; + return mColorSchemeMenus[0]; } UIMenu* SettingsMenu::createDocumentMenu() { @@ -320,10 +320,10 @@ UIMenu* SettingsMenu::createDocumentMenu() { i18n( "file_type", "File Type" ), findIcon( "file-code" ), createFileTypeMenu( true ) ); fileTypeMenu->on( Event::OnMenuShow, [this, fileTypeMenu]( const Event* ) { - if ( mFileTypeMenuesCreatedWithHeight != mUISceneNode->getPixelsSize().getHeight() ) { - for ( UIPopUpMenu* menu : mFileTypeMenues ) + if ( mFileTypeMenusCreatedWithHeight != mUISceneNode->getPixelsSize().getHeight() ) { + for ( UIPopUpMenu* menu : mFileTypeMenus ) menu->close(); - mFileTypeMenues.clear(); + mFileTypeMenus.clear(); auto* newMenu = createFileTypeMenu(); newMenu->reloadStyle( true, true ); fileTypeMenu->setSubMenu( newMenu ); @@ -482,10 +482,10 @@ UIMenu* SettingsMenu::createDocumentMenu() { mDocMenu->addSubMenu( i18n( "syntax_color_scheme", "Syntax Color Scheme" ), findIcon( "palette" ), createColorSchemeMenu( true ) ); colorSchemeMenu->on( Event::OnMenuShow, [this, colorSchemeMenu]( const Event* ) { - if ( mColorSchemeMenuesCreatedWithHeight != mUISceneNode->getPixelsSize().getHeight() ) { - for ( UIPopUpMenu* menu : mColorSchemeMenues ) + if ( mColorSchemeMenusCreatedWithHeight != mUISceneNode->getPixelsSize().getHeight() ) { + for ( UIPopUpMenu* menu : mColorSchemeMenus ) menu->close(); - mColorSchemeMenues.clear(); + mColorSchemeMenus.clear(); auto* newMenu = createColorSchemeMenu(); newMenu->reloadStyle( true, true ); colorSchemeMenu->setSubMenu( newMenu ); @@ -2406,7 +2406,7 @@ void SettingsMenu::createProjectTreeMenu( const FileInfo& file ) { } void SettingsMenu::updateColorSchemeMenu() { - for ( UIPopUpMenu* menu : mColorSchemeMenues ) { + for ( UIPopUpMenu* menu : mColorSchemeMenus ) { for ( size_t i = 0; i < menu->getCount(); i++ ) { UIWidget* widget = menu->getItem( i ); if ( widget->isType( UI_TYPE_MENURADIOBUTTON ) ) { @@ -2422,7 +2422,7 @@ void SettingsMenu::updateCurrentFileType() { if ( !mSplitter->curEditorExistsAndFocused() ) return; std::string curLang( mSplitter->getCurEditor()->getSyntaxDefinition().getLanguageName() ); - for ( UIPopUpMenu* menu : mFileTypeMenues ) { + for ( UIPopUpMenu* menu : mFileTypeMenus ) { for ( size_t i = 0; i < menu->getCount(); i++ ) { if ( menu->getItem( i )->isType( UI_TYPE_MENURADIOBUTTON ) ) { UIMenuRadioButton* menuItem = menu->getItem( i )->asType(); @@ -2661,7 +2661,7 @@ void SettingsMenu::updateMenu() { setMenuParent( mWindowMenu ); setMenuParent( mHelpMenu ); - mSettingsMenu->find( "settings-submenues-sep" )->setVisible( !showMenuBar ); + mSettingsMenu->find( "settings-submenus-sep" )->setVisible( !showMenuBar ); mSettingsMenu->getItemId( "project_settings" )->setVisible( !showMenuBar ); mSettingsMenu->getItemId( "doc-menu" )->setVisible( !showMenuBar ); mSettingsMenu->getItemId( "term-menu" )->setVisible( !showMenuBar ); diff --git a/src/tools/ecode/settingsmenu.hpp b/src/tools/ecode/settingsmenu.hpp index 0348539eb..d65a1a077 100644 --- a/src/tools/ecode/settingsmenu.hpp +++ b/src/tools/ecode/settingsmenu.hpp @@ -122,10 +122,10 @@ class SettingsMenu { UIMenuBar* mMenuBar{ nullptr }; UIPopUpMenu* mFontHintMenu{ nullptr }; UIPopUpMenu* mFontAntiAliasingMenu{ nullptr }; - std::vector mFileTypeMenues; - Float mFileTypeMenuesCreatedWithHeight{ 0 }; - std::vector mColorSchemeMenues; - Float mColorSchemeMenuesCreatedWithHeight{ 0 }; + std::vector mFileTypeMenus; + Float mFileTypeMenusCreatedWithHeight{ 0 }; + std::vector mColorSchemeMenus; + Float mColorSchemeMenusCreatedWithHeight{ 0 }; }; } // namespace ecode diff --git a/src/tools/ecode/terminalmanager.cpp b/src/tools/ecode/terminalmanager.cpp index fde665640..944e4a3f9 100644 --- a/src/tools/ecode/terminalmanager.cpp +++ b/src/tools/ecode/terminalmanager.cpp @@ -136,7 +136,7 @@ void TerminalManager::setTerminalColorSchemesPath( const std::string& terminalCo } void TerminalManager::updateColorSchemeMenu() { - for ( UIPopUpMenu* menu : mColorSchemeMenues ) { + for ( UIPopUpMenu* menu : mColorSchemeMenus ) { for ( size_t i = 0; i < menu->getCount(); i++ ) { UIWidget* widget = menu->getItem( i ); if ( widget->isType( UI_TYPE_MENURADIOBUTTON ) ) { @@ -251,7 +251,7 @@ void TerminalManager::configureTerminalScrollback() { } UIMenu* TerminalManager::createColorSchemeMenu( bool emptyMenu ) { - mColorSchemeMenuesCreatedWithHeight = + mColorSchemeMenusCreatedWithHeight = emptyMenu ? 0 : mApp->uiSceneNode()->getPixelsSize().getHeight(); size_t maxItems = 19; auto cb = [this]( const Event* event ) { @@ -262,17 +262,17 @@ UIMenu* TerminalManager::createColorSchemeMenu( bool emptyMenu ) { UIPopUpMenu* menu = UIPopUpMenu::New(); menu->addEventListener( Event::OnItemClicked, cb ); - mColorSchemeMenues.push_back( menu ); + mColorSchemeMenus.push_back( menu ); size_t total = 0; const auto& colorSchemes = mTerminalColorSchemes; if ( emptyMenu ) - return mColorSchemeMenues[0]; + return mColorSchemeMenus[0]; for ( auto& colorScheme : colorSchemes ) { menu->addRadioButton( colorScheme.first, mTerminalCurrentColorScheme == colorScheme.first ); - if ( mColorSchemeMenues.size() == 1 && menu->getCount() == 1 ) { + if ( mColorSchemeMenus.size() == 1 && menu->getCount() == 1 ) { menu->reloadStyle( true, true ); Float height = menu->getPixelsSize().getHeight(); Float tHeight = mApp->uiSceneNode()->getPixelsSize().getHeight(); @@ -285,19 +285,19 @@ UIMenu* TerminalManager::createColorSchemeMenu( bool emptyMenu ) { UIPopUpMenu* newMenu = UIPopUpMenu::New(); menu->addSubMenu( mApp->i18n( "more_ellipsis", "More..." ), nullptr, newMenu ); newMenu->addEventListener( Event::OnItemClicked, cb ); - mColorSchemeMenues.push_back( newMenu ); + mColorSchemeMenus.push_back( newMenu ); menu = newMenu; } } - return mColorSchemeMenues[0]; + return mColorSchemeMenus[0]; } void TerminalManager::updateMenuColorScheme( UIMenuSubMenu* colorSchemeMenu ) { - if ( mColorSchemeMenuesCreatedWithHeight != mApp->uiSceneNode()->getPixelsSize().getHeight() ) { - for ( UIPopUpMenu* menu : mColorSchemeMenues ) + if ( mColorSchemeMenusCreatedWithHeight != mApp->uiSceneNode()->getPixelsSize().getHeight() ) { + for ( UIPopUpMenu* menu : mColorSchemeMenus ) menu->close(); - mColorSchemeMenues.clear(); + mColorSchemeMenus.clear(); auto* newMenu = createColorSchemeMenu(); newMenu->reloadStyle( true, true ); colorSchemeMenu->setSubMenu( newMenu ); diff --git a/src/tools/ecode/terminalmanager.hpp b/src/tools/ecode/terminalmanager.hpp index 537b51cfd..9e17e46bf 100644 --- a/src/tools/ecode/terminalmanager.hpp +++ b/src/tools/ecode/terminalmanager.hpp @@ -72,8 +72,8 @@ class TerminalManager { std::map mTerminalColorSchemes; std::string mTerminalCurrentColorScheme; - Float mColorSchemeMenuesCreatedWithHeight{ 0 }; - std::vector mColorSchemeMenues; + Float mColorSchemeMenusCreatedWithHeight{ 0 }; + std::vector mColorSchemeMenus; bool mUseFrameBuffer{ false }; }; diff --git a/src/tools/ecode/uibuildsettings.cpp b/src/tools/ecode/uibuildsettings.cpp index aa1e9154f..9cb9669a1 100644 --- a/src/tools/ecode/uibuildsettings.cpp +++ b/src/tools/ecode/uibuildsettings.cpp @@ -77,7 +77,7 @@ class UICustomOutputParserWindow : public UIWindow { explicit UICustomOutputParserWindow( ProjectBuildOutputParserConfig& cfg ) : UIWindow( SIMPLE_LAYOUT, { UI_WIN_CLOSE_BUTTON | UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS | - UI_WIN_SHARE_ALPHA_WITH_CHILDS | UI_WIN_MODAL } ), + UI_WIN_SHARE_ALPHA_WITH_CHILDREN | UI_WIN_MODAL } ), mTmpCfg( cfg ), mCfg( cfg ) { static const auto CUSTOM_OUTPUT_PARSER_XML = R"xml( diff --git a/src/tools/ecode/universallocator.cpp b/src/tools/ecode/universallocator.cpp index c9945f5d9..559c45629 100644 --- a/src/tools/ecode/universallocator.cpp +++ b/src/tools/ecode/universallocator.cpp @@ -396,14 +396,14 @@ void UniversalLocator::updateCommandPaletteTable() { mCommandPalette.asyncFuzzyMatch( txt.substr( 1 ).trim(), 10000, [this]( auto res ) { mUISceneNode->runOnMainThread( [this, res] { mLocateTable->setModel( res ); - if ( mLocateTable->getModel()->hasChilds() ) + if ( mLocateTable->getModel()->hasChildren() ) mLocateTable->getSelection().set( mLocateTable->getModel()->index( 0 ) ); mLocateTable->scrollToTop(); } ); } ); } else if ( mCommandPalette.getCurModel() ) { mLocateTable->setModel( mCommandPalette.getCurModel() ); - if ( mLocateTable->getModel()->hasChilds() ) + if ( mLocateTable->getModel()->hasChildren() ) mLocateTable->getSelection().set( mLocateTable->getModel()->index( 0 ) ); } } @@ -752,7 +752,7 @@ std::shared_ptr UniversalLocator::openDocumentsModel( const std:: void UniversalLocator::updateOpenDocumentsTable() { mLocateTable->setModel( openDocumentsModel( mLocateInput->getText().substr( 2 ).trim().toUtf8() ) ); - if ( mLocateTable->getModel()->hasChilds() ) + if ( mLocateTable->getModel()->hasChildren() ) mLocateTable->getSelection().set( mLocateTable->getModel()->index( 0 ) ); mLocateTable->scrollToTop(); } @@ -789,7 +789,7 @@ UniversalLocator::openBuildModel( const std::string& pattern ) { void UniversalLocator::updateSwitchBuildTable() { mLocateTable->setModel( openBuildModel( mLocateInput->getText().substr( 3 ).trim().toUtf8() ) ); - if ( mLocateTable->getModel()->hasChilds() ) { + if ( mLocateTable->getModel()->hasChildren() ) { ModelIndex idx = mLocateTable->findRowWithText( mApp->getProjectBuildManager()->getConfig().buildName ); mLocateTable->getSelection().set( idx.isValid() ? idx @@ -876,7 +876,7 @@ UniversalLocator::openRunTargetModel( const std::string& pattern ) { void UniversalLocator::updateSwitchBuildTypeTable() { mLocateTable->setModel( openBuildTypeModel( mLocateInput->getText().substr( 4 ).trim().toUtf8() ) ); - if ( mLocateTable->getModel()->hasChilds() && nullptr != mApp->getProjectBuildManager() ) { + if ( mLocateTable->getModel()->hasChildren() && nullptr != mApp->getProjectBuildManager() ) { ModelIndex idx = mLocateTable->findRowWithText( mApp->getProjectBuildManager()->getConfig().buildType ); mLocateTable->getSelection().set( idx.isValid() ? idx @@ -889,7 +889,7 @@ void UniversalLocator::updateSwitchBuildTypeTable() { void UniversalLocator::updateSwitchRunTargetTable() { mLocateTable->setModel( openRunTargetModel( mLocateInput->getText().substr( 4 ).trim().toUtf8() ) ); - if ( mLocateTable->getModel()->hasChilds() && nullptr != mApp->getProjectBuildManager() ) { + if ( mLocateTable->getModel()->hasChildren() && nullptr != mApp->getProjectBuildManager() ) { ModelIndex idx = mLocateTable->findRowWithText( mApp->getProjectBuildManager()->getConfig().runName ); mLocateTable->getSelection().set( idx.isValid() ? idx @@ -938,7 +938,7 @@ UniversalLocator::openFileTypeModel( const std::string& pattern ) { void UniversalLocator::updateSwitchFileTypeTable() { mLocateTable->setModel( openFileTypeModel( mLocateInput->getText().substr( 3 ).trim().toUtf8() ) ); - if ( mLocateTable->getModel()->hasChilds() && mApp->getSplitter()->getCurEditor() ) { + if ( mLocateTable->getModel()->hasChildren() && mApp->getSplitter()->getCurEditor() ) { ModelIndex idx = mLocateTable->findRowWithText( mApp->getSplitter() ->getCurEditor() ->getDocumentRef()