summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorIgnacio Etcheverry <neikeq@users.noreply.github.com>2016-10-01 00:48:38 +0200
committerGitHub <noreply@github.com>2016-10-01 00:48:38 +0200
commitf30602c67a86bce393c5e67551755e0a8b3f0dd4 (patch)
treea37dd63fcf16a0776161abf1cdf7e52f9d99f52c /core
parentdabcabe9815612c7ef1c99909b14d632f13df165 (diff)
parentc333659ebcdf41851761ebd3d8edc8e5e822164e (diff)
Merge pull request #6652 from volzhs/word-wrap
Fix typo for word_wrap
Diffstat (limited to 'core')
-rw-r--r--core/ustring.cpp2
-rw-r--r--core/ustring.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp
index 0d887210c3..f7dcba6b14 100644
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -3173,7 +3173,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 bb57b11d88..09d13a9e64 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;