Kaydet (Commit) 9d68c1c2 authored tarafından Caolán McNamara's avatar Caolán McNamara

avoid implicit casting

üst 90b542f0
...@@ -39,7 +39,7 @@ using namespace connectivity::mozab; ...@@ -39,7 +39,7 @@ using namespace connectivity::mozab;
void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &nss) void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &nss)
{ {
// Convert to ::rtl::OString (utf-8 encoding). // Convert to ::rtl::OString (utf-8 encoding).
::rtl::OString os(ous,ous.getLength(), RTL_TEXTENCODING_UTF8); ::rtl::OString os(rtl::OUStringToOString(ous, RTL_TEXTENCODING_UTF8));
const char *cs = os.getStr(); const char *cs = os.getStr();
PRUint32 csLen = os.getLength(); PRUint32 csLen = os.getLength();
...@@ -100,7 +100,7 @@ void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, ::rtl::OUString & ...@@ -100,7 +100,7 @@ void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, ::rtl::OUString &
char *MTypeConverter::ouStringToCCharStringUtf8(::rtl::OUString const &ous) char *MTypeConverter::ouStringToCCharStringUtf8(::rtl::OUString const &ous)
{ {
// Convert to ::rtl::OString, // Convert to ::rtl::OString,
::rtl::OString os(ous,ous.getLength(), RTL_TEXTENCODING_UTF8); ::rtl::OString os(rtl::OUStringToOString(ous, RTL_TEXTENCODING_UTF8));
const char *cs = os.getStr(); const char *cs = os.getStr();
...@@ -110,7 +110,7 @@ char *MTypeConverter::ouStringToCCharStringUtf8(::rtl::OUString const &ous) ...@@ -110,7 +110,7 @@ char *MTypeConverter::ouStringToCCharStringUtf8(::rtl::OUString const &ous)
char *MTypeConverter::ouStringToCCharStringAscii(::rtl::OUString const &ous) char *MTypeConverter::ouStringToCCharStringAscii(::rtl::OUString const &ous)
{ {
// Convert ::rtl::OUString to ::rtl::OString, // Convert ::rtl::OUString to ::rtl::OString,
::rtl::OString os(ous,ous.getLength(), RTL_TEXTENCODING_ASCII_US); ::rtl::OString os(rtl::OUStringToOString(ous, RTL_TEXTENCODING_ASCII_US));
return(strdup(os.getStr())); return(strdup(os.getStr()));
} }
...@@ -126,7 +126,7 @@ char *MTypeConverter::nsStringToCCharStringAscii(nsString const &nss) ...@@ -126,7 +126,7 @@ char *MTypeConverter::nsStringToCCharStringAscii(nsString const &nss)
::std::string MTypeConverter::ouStringToStlString(::rtl::OUString const &ous) ::std::string MTypeConverter::ouStringToStlString(::rtl::OUString const &ous)
{ {
// Convert ::rtl::OUString to ::rtl::OString. // Convert ::rtl::OUString to ::rtl::OString.
::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US); ::rtl::OString os(rtl::OUStringToOString(ous,RTL_TEXTENCODING_ASCII_US));
return( ::std::string(os.getStr())); return( ::std::string(os.getStr()));
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
......
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