Commit 24b1d8d0 authored by Pino Toscano's avatar Pino Toscano
Browse files

[cpp] {from,to}_utf_8() -> {from,to}_utf8()

parent 690af1bc
......@@ -85,7 +85,7 @@ ustring::~ustring()
{
}
byte_array ustring::to_utf_8() const
byte_array ustring::to_utf8() const
{
if (!size()) {
return byte_array();
......@@ -132,7 +132,7 @@ std::string ustring::to_latin1() const
return ret;
}
ustring ustring::from_utf_8(const char *str, int len)
ustring ustring::from_utf8(const char *str, int len)
{
if (len <= 0) {
len = std::strlen(str);
......
......@@ -78,10 +78,10 @@ public:
ustring(size_type len, value_type ch);
~ustring();
byte_array to_utf_8() const;
byte_array to_utf8() const;
std::string to_latin1() const;
static ustring from_utf_8(const char *str, int len = -1);
static ustring from_utf8(const char *str, int len = -1);
static ustring from_latin1(const std::string &str);
private:
......
......@@ -184,5 +184,5 @@ ustring page::text(const rectf &r) const
} else {
s.reset(td.getText(r.left(), r.top(), r.right(), r.bottom()));
}
return ustring::from_utf_8(s->getCString());
return ustring::from_utf8(s->getCString());
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment