summaryrefslogtreecommitdiff
path: root/core/fpdfdoc
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-04-05 11:02:18 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-05 11:02:18 -0700
commit179bebb9a14dfd3ba91e9e068d4d436657a7c780 (patch)
tree895a59bfcf85a4730badfb2a6df71cf8679a2249 /core/fpdfdoc
parent4cd49e1c6076bd9ef2d18480d893038822668262 (diff)
downloadpdfium-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 'core/fpdfdoc')
-rw-r--r--core/fpdfdoc/doc_basic.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/core/fpdfdoc/doc_basic.cpp b/core/fpdfdoc/doc_basic.cpp
index 0c7f895405..ad21db815c 100644
--- a/core/fpdfdoc/doc_basic.cpp
+++ b/core/fpdfdoc/doc_basic.cpp
@@ -288,23 +288,23 @@ CFX_WideString CPDF_FileSpec::DecodeFileName(const CFX_WideStringC& filepath) {
#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
if (filepath.Left(sizeof("/Mac") - 1) == CFX_WideStringC(L"/Mac"))
- return ChangeSlashToPlatform(filepath.GetPtr() + 1);
- return ChangeSlashToPlatform(filepath.GetPtr());
+ return ChangeSlashToPlatform(filepath.raw_str() + 1);
+ return ChangeSlashToPlatform(filepath.raw_str());
#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
if (filepath.GetAt(0) != '/')
- return ChangeSlashToPlatform(filepath.GetPtr());
+ return ChangeSlashToPlatform(filepath.raw_str());
if (filepath.GetAt(1) == '/')
- return ChangeSlashToPlatform(filepath.GetPtr() + 1);
+ return ChangeSlashToPlatform(filepath.raw_str() + 1);
if (filepath.GetAt(2) == '/') {
CFX_WideString result;
result += filepath.GetAt(1);
result += ':';
- result += ChangeSlashToPlatform(filepath.GetPtr() + 2);
+ result += ChangeSlashToPlatform(filepath.raw_str() + 2);
return result;
}
CFX_WideString result;
result += '\\';
- result += ChangeSlashToPlatform(filepath.GetPtr());
+ result += ChangeSlashToPlatform(filepath.raw_str());
return result;
#else
return filepath;
@@ -356,27 +356,27 @@ CFX_WideString CPDF_FileSpec::EncodeFileName(const CFX_WideStringC& filepath) {
if (filepath.GetAt(2) != '\\') {
result += '/';
}
- result += ChangeSlashToPDF(filepath.GetPtr() + 2);
+ result += ChangeSlashToPDF(filepath.raw_str() + 2);
return result;
}
if (filepath.GetAt(0) == '\\' && filepath.GetAt(1) == '\\') {
- return ChangeSlashToPDF(filepath.GetPtr() + 1);
+ return ChangeSlashToPDF(filepath.raw_str() + 1);
}
if (filepath.GetAt(0) == '\\') {
CFX_WideString result;
result = '/';
- result += ChangeSlashToPDF(filepath.GetPtr());
+ result += ChangeSlashToPDF(filepath.raw_str());
return result;
}
- return ChangeSlashToPDF(filepath.GetPtr());
+ return ChangeSlashToPDF(filepath.raw_str());
#elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
if (filepath.Left(sizeof("Mac") - 1) == FX_WSTRC(L"Mac")) {
CFX_WideString result;
result = '/';
- result += ChangeSlashToPDF(filepath.GetPtr());
+ result += ChangeSlashToPDF(filepath.raw_str());
return result;
}
- return ChangeSlashToPDF(filepath.GetPtr());
+ return ChangeSlashToPDF(filepath.raw_str());
#else
return filepath;
#endif
@@ -513,5 +513,5 @@ int32_t CPDF_PageLabel::GetPageByLabel(const CFX_ByteStringC& bsLabel) const {
return -1;
}
int32_t CPDF_PageLabel::GetPageByLabel(const CFX_WideStringC& wsLabel) const {
- return GetPageByLabel(PDF_EncodeText(wsLabel.GetPtr()).AsByteStringC());
+ return GetPageByLabel(PDF_EncodeText(wsLabel.raw_str()).AsByteStringC());
}