aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2019-10-18 17:18:54 +0200
committerEugene Sandulenko2019-10-18 17:20:27 +0200
commit9ff8e69aa98b41a92ac561bfbb15efb9cf58cdac (patch)
tree8ad25dbb3871b668ab3b559e551629b19b8fe050
parent25e448b5bd157fd3851f9149bed1477787220c5e (diff)
downloadscummvm-rg350-9ff8e69aa98b41a92ac561bfbb15efb9cf58cdac.tar.gz
scummvm-rg350-9ff8e69aa98b41a92ac561bfbb15efb9cf58cdac.tar.bz2
scummvm-rg350-9ff8e69aa98b41a92ac561bfbb15efb9cf58cdac.zip
COMMON: Added new + operator to U32String
-rw-r--r--common/ustr.cpp6
-rw-r--r--common/ustr.h3
2 files changed, 9 insertions, 0 deletions
diff --git a/common/ustr.cpp b/common/ustr.cpp
index aab9dd6f05..07a0852a94 100644
--- a/common/ustr.cpp
+++ b/common/ustr.cpp
@@ -768,4 +768,10 @@ String convertFromU32String(const U32String &string, CodePage page) {
return charsetString;
}
+U32String operator+(const U32String &x, const U32String &y) {
+ U32String temp(x);
+ temp += y;
+ return temp;
+}
+
} // End of namespace Common
diff --git a/common/ustr.h b/common/ustr.h
index 431cd9694a..3d76eda765 100644
--- a/common/ustr.h
+++ b/common/ustr.h
@@ -237,6 +237,9 @@ enum CodePage {
kWindows1257
};
+
+U32String operator+(const U32String &x, const U32String &y);
+
U32String convertToU32String(const char *str, CodePage page = kUtf8);
String convertFromU32String(const U32String &str, CodePage page = kUtf8);