diff options
author | dsinclair <dsinclair@chromium.org> | 2016-04-05 11:02:18 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-05 11:02:18 -0700 |
commit | 179bebb9a14dfd3ba91e9e068d4d436657a7c780 (patch) | |
tree | 895a59bfcf85a4730badfb2a6df71cf8679a2249 /fpdfsdk | |
parent | 4cd49e1c6076bd9ef2d18480d893038822668262 (diff) | |
download | pdfium-179bebb9a14dfd3ba91e9e068d4d436657a7c780.tar.xz |
Rename GetCStr and GetPtr to match CFX_ByteString.
This CL updates CFX_ByteStringC to use the more common c_str
and raw_str instead of GetCStr and GetPtr.
Review URL: https://codereview.chromium.org/1857713003
Diffstat (limited to 'fpdfsdk')
-rw-r--r-- | fpdfsdk/fpdfxfa/fpdfxfa_app.cpp | 20 | ||||
-rw-r--r-- | fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/cjs_runtime.cpp | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp index 4e1b95ea64..46a3d53b30 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp @@ -169,7 +169,7 @@ int32_t CPDFXFA_App::MsgBox(const CFX_WideStringC& wsMessage, iButtonType |= 3; break; } - int32_t iRet = pEnv->JS_appAlert(wsMessage.GetPtr(), wsTitle.GetPtr(), + int32_t iRet = pEnv->JS_appAlert(wsMessage.raw_str(), wsTitle.raw_str(), iButtonType, iconType); switch (iRet) { case 1: @@ -193,9 +193,9 @@ void CPDFXFA_App::Response(CFX_WideString& wsAnswer, if (pEnv) { int nLength = 2048; char* pBuff = new char[nLength]; - nLength = pEnv->JS_appResponse(wsQuestion.GetPtr(), wsTitle.GetPtr(), - wsDefaultAnswer.GetPtr(), NULL, bMark, pBuff, - nLength); + nLength = pEnv->JS_appResponse(wsQuestion.raw_str(), wsTitle.raw_str(), + wsDefaultAnswer.raw_str(), NULL, bMark, + pBuff, nLength); if (nLength > 0) { nLength = nLength > 2046 ? 2046 : nLength; pBuff[nLength] = 0; @@ -228,7 +228,7 @@ int32_t CPDFXFA_App::GetDocumentCountInBatch() { IFX_FileRead* CPDFXFA_App::DownloadURL(const CFX_WideStringC& wsURL) { CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0); if (pEnv) { - return pEnv->FFI_DownloadFromURL(wsURL.GetPtr()); + return pEnv->FFI_DownloadFromURL(wsURL.raw_str()); } return NULL; } @@ -241,9 +241,9 @@ FX_BOOL CPDFXFA_App::PostRequestURL(const CFX_WideStringC& wsURL, CFX_WideString& wsResponse) { CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0); if (pEnv) { - wsResponse = pEnv->FFI_PostRequestURL(wsURL.GetPtr(), wsData.GetPtr(), - wsContentType.GetPtr(), - wsEncode.GetPtr(), wsHeader.GetPtr()); + wsResponse = pEnv->FFI_PostRequestURL( + wsURL.raw_str(), wsData.raw_str(), wsContentType.raw_str(), + wsEncode.raw_str(), wsHeader.raw_str()); return TRUE; } return FALSE; @@ -254,8 +254,8 @@ FX_BOOL CPDFXFA_App::PutRequestURL(const CFX_WideStringC& wsURL, const CFX_WideStringC& wsEncode) { CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0); if (pEnv) { - return pEnv->FFI_PutRequestURL(wsURL.GetPtr(), wsData.GetPtr(), - wsEncode.GetPtr()); + return pEnv->FFI_PutRequestURL(wsURL.raw_str(), wsData.raw_str(), + wsEncode.raw_str()); } return FALSE; } diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp index 79147b172e..fbc05bd9aa 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp @@ -738,7 +738,7 @@ void CPDFXFA_Document::GotoURL(CXFA_FFDoc* hDoc, if (pEnv == NULL) return; - CFX_WideStringC str(bsURL.GetPtr()); + CFX_WideStringC str(bsURL.raw_str()); pEnv->FFI_GotoURL(this, str, bAppend); } diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp index 9c616e6c0e..8e01017467 100644 --- a/fpdfsdk/javascript/cjs_runtime.cpp +++ b/fpdfsdk/javascript/cjs_runtime.cpp @@ -263,7 +263,7 @@ CFX_WideString ChangeObjName(const CFX_WideString& str) { FX_BOOL CJS_Runtime::GetHValueByName(const CFX_ByteStringC& utf8Name, FXJSE_HVALUE hValue) { #ifdef PDF_ENABLE_XFA - const FX_CHAR* name = utf8Name.GetCStr(); + const FX_CHAR* name = utf8Name.c_str(); v8::Locker lock(GetIsolate()); v8::Isolate::Scope isolate_scope(GetIsolate()); @@ -300,7 +300,7 @@ FX_BOOL CJS_Runtime::SetHValueByName(const CFX_ByteStringC& utf8Name, #ifdef PDF_ENABLE_XFA if (utf8Name.IsEmpty() || hValue == NULL) return FALSE; - const FX_CHAR* name = utf8Name.GetCStr(); + const FX_CHAR* name = utf8Name.c_str(); v8::Isolate* pIsolate = GetIsolate(); v8::Locker lock(pIsolate); v8::Isolate::Scope isolate_scope(pIsolate); |