Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-27 18:12:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

changed std::wstring for std::string+utf8 in chat, and messages

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6795 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-10-03 21:41:34 +00:00
parent 420fadb5c3
commit 695e417fd5
24 changed files with 132 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libretroshare/src/serialiser/rstlvfileitem.cc
View file

@ -417,9 +417,9 @@ uint32_t RsTlvFileSet::TlvSize()
/* now add comment and title length of this tlv object */
if (title.length() > 0)
s += GetTlvWideStringSize(title);
s += GetTlvStringSize(title);
if (comment.length() > 0)
s += GetTlvWideStringSize(comment);
s += GetTlvStringSize(comment);
return s;
}
@ -454,9 +454,9 @@ bool RsTlvFileSet::SetTlv(void *data, uint32_t size, uint32_t *offset) /* se
/* now optional ones */
if (title.length() > 0)
ok &= SetTlvWideString(data, tlvend, offset, TLV_TYPE_WSTR_TITLE, title);
ok &= SetTlvString(data, tlvend, offset, TLV_TYPE_STR_TITLE, title);
if (comment.length() > 0)
ok &= SetTlvWideString(data, tlvend, offset, TLV_TYPE_WSTR_COMMENT, comment);
ok &= SetTlvString(data, tlvend, offset, TLV_TYPE_STR_COMMENT, comment);
return ok;
@ -500,15 +500,15 @@ bool RsTlvFileSet::GetTlv(void *data, uint32_t size, uint32_t *offset)
items.push_back(newitem);
}
}
else if (tlvsubtype == TLV_TYPE_WSTR_TITLE)
else if (tlvsubtype == TLV_TYPE_STR_TITLE)
{
ok &= GetTlvWideString(data, tlvend, offset,
TLV_TYPE_WSTR_TITLE, title);
ok &= GetTlvString(data, tlvend, offset,
TLV_TYPE_STR_TITLE, title);
}
else if (tlvsubtype == TLV_TYPE_WSTR_COMMENT)
else if (tlvsubtype == TLV_TYPE_STR_COMMENT)
{
ok &= GetTlvWideString(data, tlvend, offset,
TLV_TYPE_WSTR_COMMENT, comment);
ok &= GetTlvString(data, tlvend, offset,
TLV_TYPE_STR_COMMENT, comment);
}
else
{