diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-18 21:37:17 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-18 22:01:42 +0100 |
commit | 9f479f096cb50fa8d1215e68c262f110116114ef (patch) | |
tree | f115332a8e73ab059c16b077873ca2f3faab9cb1 /core | |
parent | a1c08b71091c47d626410406f36a4bb6fca40953 (diff) |
Fix typos in code and docs with codespell
Using v1.11.0 from https://github.com/lucasdemarchi/codespell
Diffstat (limited to 'core')
-rw-r--r-- | core/image.cpp | 2 | ||||
-rw-r--r-- | core/io/marshalls.cpp | 2 | ||||
-rw-r--r-- | core/list.h | 2 | ||||
-rw-r--r-- | core/math/octree.h | 2 | ||||
-rw-r--r-- | core/method_bind.h | 2 | ||||
-rw-r--r-- | core/oa_hash_map.h | 2 | ||||
-rw-r--r-- | core/project_settings.cpp | 2 | ||||
-rw-r--r-- | core/project_settings.h | 6 | ||||
-rw-r--r-- | core/script_language.h | 2 | ||||
-rw-r--r-- | core/ustring.cpp | 10 |
10 files changed, 16 insertions, 16 deletions
diff --git a/core/image.cpp b/core/image.cpp index 41d70e6df6..07e705265d 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -775,7 +775,7 @@ void Image::crop_from_point(int p_x, int p_y, int p_width, int p_height) { ERR_FAIL_COND(p_y + p_height > MAX_HEIGHT); /* to save memory, cropping should be done in-place, however, since this function - will most likely either not be used much, or in critical areas, for now it wont, because + will most likely either not be used much, or in critical areas, for now it won't, because it's a waste of time. */ if (p_width == width && p_height == height && p_x == 0 && p_y == 0) diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index 35b9a8610c..9e21287780 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -333,7 +333,7 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int len -= 12; buf += 12; - if (flags & 2) // Obsolete format with property seperate from subpath + if (flags & 2) // Obsolete format with property separate from subpath subnamecount++; uint32_t total = namecount + subnamecount; diff --git a/core/list.h b/core/list.h index a00372e39f..f977df4634 100644 --- a/core/list.h +++ b/core/list.h @@ -388,7 +388,7 @@ public: }; /** - * return wether the list is empty + * return whether the list is empty */ _FORCE_INLINE_ bool empty() const { diff --git a/core/math/octree.h b/core/math/octree.h index 7411e4aa52..4e3d6257f0 100644 --- a/core/math/octree.h +++ b/core/math/octree.h @@ -612,7 +612,7 @@ bool Octree<T, use_pairs, AL>::_remove_element_from_octant(Element *p_element, O bool unpaired = false; if (use_pairs && p_octant->last_pass != pass) { - // check wether we should unpair stuff + // check whether we should unpair stuff // always test pairable typename List<Element *, AL>::Element *E = p_octant->pairable_elements.front(); while (E) { diff --git a/core/method_bind.h b/core/method_bind.h index 2e5712c3fe..e02d64c935 100644 --- a/core/method_bind.h +++ b/core/method_bind.h @@ -243,7 +243,7 @@ public: PropertyInfo get_argument_info(int p_argument) const; PropertyInfo get_return_info() const; - void set_argument_names(const Vector<StringName> &p_names); //set by class, db, cant be inferred otherwise + void set_argument_names(const Vector<StringName> &p_names); //set by class, db, can't be inferred otherwise Vector<StringName> get_argument_names() const; #endif diff --git a/core/oa_hash_map.h b/core/oa_hash_map.h index c3b32af545..280aea6a14 100644 --- a/core/oa_hash_map.h +++ b/core/oa_hash_map.h @@ -36,7 +36,7 @@ #include "os/copymem.h" #include "os/memory.h" -// uncomment this to disable intial local storage. +// uncomment this to disable initial local storage. #define OA_HASH_MAP_INITIAL_LOCAL_STORAGE /** diff --git a/core/project_settings.cpp b/core/project_settings.cpp index 0c19de382c..0991c0df68 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -167,7 +167,7 @@ bool ProjectSettings::_set(const StringName &p_name, const Variant &p_value) { } if (props.has(p_name)) { - if (!props[p_name].overrided) + if (!props[p_name].overridden) props[p_name].variant = p_value; } else { diff --git a/core/project_settings.h b/core/project_settings.h index e85092e431..eba53441cf 100644 --- a/core/project_settings.h +++ b/core/project_settings.h @@ -58,19 +58,19 @@ protected: Variant variant; Variant initial; bool hide_from_editor; - bool overrided; + bool overridden; VariantContainer() : order(0), persist(false), hide_from_editor(false), - overrided(false) { + overridden(false) { } VariantContainer(const Variant &p_variant, int p_order, bool p_persist = false) : order(p_order), persist(p_persist), variant(p_variant), hide_from_editor(false), - overrided(false) { + overridden(false) { } }; diff --git a/core/script_language.h b/core/script_language.h index 66614a293c..d1da0a3b72 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -179,7 +179,7 @@ class ScriptCodeCompletionCache { public: virtual RES get_cached_resource(const String &p_path) = 0; - static ScriptCodeCompletionCache *get_sigleton() { return singleton; } + static ScriptCodeCompletionCache *get_singleton() { return singleton; } ScriptCodeCompletionCache(); }; diff --git a/core/ustring.cpp b/core/ustring.cpp index 1fce4f1826..7aa2b012de 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -2217,7 +2217,7 @@ int String::find(const String &p_str, int p_from) const { const int len = length(); if (src_len == 0 || len == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *src = c_str(); const CharType *str = p_str.c_str(); @@ -2256,7 +2256,7 @@ int String::find(const char *p_str, int p_from) const { const int len = length(); if (len == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *src = c_str(); @@ -2317,7 +2317,7 @@ int String::findmk(const Vector<String> &p_keys, int p_from, int *r_key) const { int len = length(); if (len == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *src = c_str(); @@ -2366,7 +2366,7 @@ int String::findn(const String &p_str, int p_from) const { int src_len = p_str.length(); if (src_len == 0 || length() == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *srcd = c_str(); @@ -2462,7 +2462,7 @@ int String::rfindn(const String &p_str, int p_from) const { int len = length(); if (src_len == 0 || len == 0) - return -1; //wont find anything! + return -1; // won't find anything! const CharType *src = c_str(); |