Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1607)

Unified Diff: core/include/fxcrt/fx_string.h

Issue 1711893003: Remove CFX_{Byte,Wide}String::ConvertFrom(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: address comments Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | core/src/fpdfdoc/doc_basic_unittest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/include/fxcrt/fx_string.h
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h
index 36eba8d1c19583af44eb43c4f648b30805eb31aa..c625bfa9258247f5da4357e53677176eeb809c47 100644
--- a/core/include/fxcrt/fx_string.h
+++ b/core/include/fxcrt/fx_string.h
@@ -289,8 +289,6 @@ class CFX_ByteString {
CFX_WideString UTF8Decode() const;
- void ConvertFrom(const CFX_WideString& str, CFX_CharMap* pCharMap = NULL);
-
FX_DWORD GetID(FX_STRSIZE start_pos = 0) const;
#define FXFORMAT_SIGNED 1
@@ -561,7 +559,10 @@ class CFX_WideString {
~CFX_WideString();
- static CFX_WideString FromLocal(const char* str, FX_STRSIZE len = -1);
+ static CFX_WideString FromLocal(const CFX_ByteString& str);
+
+ static CFX_WideString FromCodePage(const CFX_ByteString& str,
+ FX_WORD codepage);
static CFX_WideString FromUTF8(const char* str, FX_STRSIZE len);
@@ -685,8 +686,6 @@ class CFX_WideString {
CFX_ByteString UTF16LE_Encode() const;
- void ConvertFrom(const CFX_ByteString& str, CFX_CharMap* pCharMap = NULL);
-
protected:
class StringData {
public:
« no previous file with comments | « no previous file | core/src/fpdfdoc/doc_basic_unittest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698