diff options
| author | volzhs | 2016-09-30 03:28:05 +0900 |
|---|---|---|
| committer | Rémi Verschelde | 2016-10-09 17:23:58 +0200 |
| commit | 73e7ccabf52aaae94edfa16409d7a15cfff57cd8 (patch) | |
| tree | e3cb5e73db49f013271bf95e249362d8e83e8ee5 | |
| parent | 721599c797c6e3fe59d4bc1c7a18c4448f0538da (diff) | |
| download | godot-73e7ccabf52aaae94edfa16409d7a15cfff57cd8.tar.gz godot-73e7ccabf52aaae94edfa16409d7a15cfff57cd8.tar.zst godot-73e7ccabf52aaae94edfa16409d7a15cfff57cd8.zip | |
Fix typo for word_wrap
(cherry picked from commit c333659ebcdf41851761ebd3d8edc8e5e822164e)
Diffstat (limited to '')
| -rw-r--r-- | core/ustring.cpp | 2 | ||||
| -rw-r--r-- | core/ustring.h | 2 | ||||
| -rw-r--r-- | tools/editor/property_editor.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/scene_tree_editor.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp index a749ce31f..2e907381f 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -3178,7 +3178,7 @@ bool String::is_valid_identifier() const { //kind of poor should be rewritten properly -String String::world_wrap(int p_chars_per_line) const { +String String::word_wrap(int p_chars_per_line) const { int from=0; int last_space=0; diff --git a/core/ustring.h b/core/ustring.h index bb57b11d8..09d13a9e6 100644 --- a/core/ustring.h +++ b/core/ustring.h @@ -218,7 +218,7 @@ public: String c_escape() const; String c_unescape() const; String json_escape() const; - String world_wrap(int p_chars_per_line) const; + String word_wrap(int p_chars_per_line) const; String percent_encode() const; String percent_decode() const; diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index 670b03c1d..d44e53d7d 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -2785,7 +2785,7 @@ void PropertyEditor::update_tree() { if (E) { descr=E->get().brief_description; } - class_descr_cache[type]=descr.world_wrap(80); + class_descr_cache[type]=descr.word_wrap(80); } @@ -2878,7 +2878,7 @@ void PropertyEditor::update_tree() { if (E) { for(int i=0;i<E->get().methods.size();i++) { if (E->get().methods[i].name==setter.operator String()) { - descr=E->get().methods[i].description.strip_edges().world_wrap(80); + descr=E->get().methods[i].description.strip_edges().word_wrap(80); } } } diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index 73358e805..1ed0a22f5 100644 --- a/tools/editor/scene_tree_editor.cpp +++ b/tools/editor/scene_tree_editor.cpp @@ -254,7 +254,7 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item,int p_column,int p_id) String config_err = n->get_configuration_warning(); if (config_err==String()) return; - config_err=config_err.world_wrap(80); + config_err=config_err.word_wrap(80); warning->set_text(config_err); warning->popup_centered_minsize(); |