This commit is contained in:
Igor Pavlov
2022-01-22 18:43:09 +00:00
committed by Kornel
parent 52eeaf1ad6
commit c3529a41f5
88 changed files with 3474 additions and 435 deletions

View File

@@ -1096,14 +1096,14 @@ UString::UString(char c)
UString::UString(const wchar_t *s)
{
unsigned len = MyStringLen(s);
const unsigned len = MyStringLen(s);
SetStartLen(len);
wmemcpy(_chars, s, len + 1);
}
UString::UString(const char *s)
{
unsigned len = MyStringLen(s);
const unsigned len = MyStringLen(s);
SetStartLen(len);
wchar_t *chars = _chars;
for (unsigned i = 0; i < len; i++)
@@ -1111,6 +1111,17 @@ UString::UString(const char *s)
chars[len] = 0;
}
UString::UString(const AString &s)
{
const unsigned len = s.Len();
SetStartLen(len);
wchar_t *chars = _chars;
const char *s2 = s.Ptr();
for (unsigned i = 0; i < len; i++)
chars[i] = (unsigned char)s2[i];
chars[len] = 0;
}
UString::UString(const UString &s)
{
SetStartLen(s._len);