summaryrefslogtreecommitdiffstats
path: root/core/ustring.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-25 14:52:40 -0300
committerGitHub <noreply@github.com>2017-01-25 14:52:40 -0300
commit4c28f35b2c6dacd30a0e10453af1bcd977de9342 (patch)
tree8d843a57b0a49a6bc09a799a5fc7bdb3540b944b /core/ustring.cpp
parent7e1afeafd4a347c309562c6783119f64e99fc317 (diff)
parent7dbb1c0571c0d1fb26c28552b09430807cc4d717 (diff)
downloadredot-engine-4c28f35b2c6dacd30a0e10453af1bcd977de9342.tar.gz
Merge pull request #7002 from RandomShaper/vcs-friendliness
Greater VCS friendliness
Diffstat (limited to 'core/ustring.cpp')
-rw-r--r--core/ustring.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp
index 478c427fb9..a0d26ea0af 100644
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -3410,8 +3410,17 @@ String String::c_escape() const {
escaped=escaped.replace("\t","\\t");
escaped=escaped.replace("\v","\\v");
escaped=escaped.replace("\'","\\'");
- escaped=escaped.replace("\"","\\\"");
escaped=escaped.replace("\?","\\?");
+ escaped=escaped.replace("\"","\\\"");
+
+ return escaped;
+}
+
+String String::c_escape_multiline() const {
+
+ String escaped=*this;
+ escaped=escaped.replace("\\","\\\\");
+ escaped=escaped.replace("\"","\\\"");
return escaped;
}