diff options
author | Jaromir Wysoglad | 2019-07-31 22:40:45 +0200 |
---|---|---|
committer | Filippos Karapetis | 2019-08-24 18:12:45 +0300 |
commit | 613613568cbeee923a23400716c743be01d3906e (patch) | |
tree | a69ca274f59df50f42b6d04b92c759c29038560c /common/encoding.h | |
parent | 24d35df4760678f7592a42c2b78453bdfd6e0050 (diff) | |
download | scummvm-rg350-613613568cbeee923a23400716c743be01d3906e.tar.gz scummvm-rg350-613613568cbeee923a23400716c743be01d3906e.tar.bz2 scummvm-rg350-613613568cbeee923a23400716c743be01d3906e.zip |
COMMON: Rename methods in Common::Encoding
Diffstat (limited to 'common/encoding.h')
-rw-r--r-- | common/encoding.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/common/encoding.h b/common/encoding.h index 67c5ac68ca..014000d5ae 100644 --- a/common/encoding.h +++ b/common/encoding.h @@ -119,8 +119,7 @@ class Encoding { iconv_t _iconvHandle; /** - * Takes care of transliteration and calls conversion2 for the encoding - * conversion + * Takes care of transliteration and calls conversion * * The result has to be freed after use. * @@ -132,7 +131,7 @@ class Encoding { * * @return Converted string (must be freed) or nullptr if the conversion failed */ - static char *conversion(iconv_t iconvHandle, const String &to, const String &from, const char *string, size_t length); + static char *convertWithTransliteration(iconv_t iconvHandle, const String &to, const String &from, const char *string, size_t length); /** * Calls as many conversion functions as possible or until the conversion @@ -149,7 +148,7 @@ class Encoding { * * @return Converted string (must be freed) or nullptr if the conversion failed */ - static char *conversion2(iconv_t iconvHandle, const String &to, const String &from, const char *string, size_t length); + static char *conversion(iconv_t iconvHandle, const String &to, const String &from, const char *string, size_t length); /** * Tries to convert the string using iconv. |