summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/fpdfdoc/doc_basic.cpp26
-rw-r--r--core/fxcrt/fx_basic_buffer.cpp2
-rw-r--r--core/fxcrt/fx_basic_wstring.cpp12
-rw-r--r--core/fxcrt/fxcrt_windows.cpp2
-rw-r--r--core/fxcrt/include/fx_string.h6
5 files changed, 24 insertions, 24 deletions
diff --git a/core/fpdfdoc/doc_basic.cpp b/core/fpdfdoc/doc_basic.cpp
index 2555d4839b..744475e505 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.raw_str() + 1);
- return ChangeSlashToPlatform(filepath.raw_str());
+ return ChangeSlashToPlatform(filepath.c_str() + 1);
+ return ChangeSlashToPlatform(filepath.c_str());
#elif _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
if (filepath.GetAt(0) != '/')
- return ChangeSlashToPlatform(filepath.raw_str());
+ return ChangeSlashToPlatform(filepath.c_str());
if (filepath.GetAt(1) == '/')
- return ChangeSlashToPlatform(filepath.raw_str() + 1);
+ return ChangeSlashToPlatform(filepath.c_str() + 1);
if (filepath.GetAt(2) == '/') {
CFX_WideString result;
result += filepath.GetAt(1);
result += ':';
- result += ChangeSlashToPlatform(filepath.raw_str() + 2);
+ result += ChangeSlashToPlatform(filepath.c_str() + 2);
return result;
}
CFX_WideString result;
result += '\\';
- result += ChangeSlashToPlatform(filepath.raw_str());
+ result += ChangeSlashToPlatform(filepath.c_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.raw_str() + 2);
+ result += ChangeSlashToPDF(filepath.c_str() + 2);
return result;
}
if (filepath.GetAt(0) == '\\' && filepath.GetAt(1) == '\\') {
- return ChangeSlashToPDF(filepath.raw_str() + 1);
+ return ChangeSlashToPDF(filepath.c_str() + 1);
}
if (filepath.GetAt(0) == '\\') {
CFX_WideString result;
result = '/';
- result += ChangeSlashToPDF(filepath.raw_str());
+ result += ChangeSlashToPDF(filepath.c_str());
return result;
}
- return ChangeSlashToPDF(filepath.raw_str());
+ return ChangeSlashToPDF(filepath.c_str());
#elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
if (filepath.Left(sizeof("Mac") - 1) == FX_WSTRC(L"Mac")) {
CFX_WideString result;
result = '/';
- result += ChangeSlashToPDF(filepath.raw_str());
+ result += ChangeSlashToPDF(filepath.c_str());
return result;
}
- return ChangeSlashToPDF(filepath.raw_str());
+ return ChangeSlashToPDF(filepath.c_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.raw_str()).AsByteStringC());
+ return GetPageByLabel(PDF_EncodeText(wsLabel.c_str()).AsByteStringC());
}
diff --git a/core/fxcrt/fx_basic_buffer.cpp b/core/fxcrt/fx_basic_buffer.cpp
index 9d0397efeb..8553474914 100644
--- a/core/fxcrt/fx_basic_buffer.cpp
+++ b/core/fxcrt/fx_basic_buffer.cpp
@@ -142,7 +142,7 @@ void CFX_WideTextBuf::AppendChar(FX_WCHAR ch) {
}
CFX_WideTextBuf& CFX_WideTextBuf::operator<<(const CFX_WideStringC& str) {
- AppendBlock(str.raw_str(), str.GetLength() * sizeof(FX_WCHAR));
+ AppendBlock(str.c_str(), str.GetLength() * sizeof(FX_WCHAR));
return *this;
}
diff --git a/core/fxcrt/fx_basic_wstring.cpp b/core/fxcrt/fx_basic_wstring.cpp
index 8940c1a37f..cd60036acd 100644
--- a/core/fxcrt/fx_basic_wstring.cpp
+++ b/core/fxcrt/fx_basic_wstring.cpp
@@ -103,7 +103,7 @@ CFX_WideString::CFX_WideString(const CFX_WideStringC& str) {
}
m_pData = StringData::Create(str.GetLength());
if (m_pData) {
- FXSYS_memcpy(m_pData->m_String, str.raw_str(),
+ FXSYS_memcpy(m_pData->m_String, str.c_str(),
str.GetLength() * sizeof(FX_WCHAR));
}
}
@@ -116,9 +116,9 @@ CFX_WideString::CFX_WideString(const CFX_WideStringC& str1,
}
m_pData = StringData::Create(nNewLen);
if (m_pData) {
- FXSYS_memcpy(m_pData->m_String, str1.raw_str(),
+ FXSYS_memcpy(m_pData->m_String, str1.c_str(),
str1.GetLength() * sizeof(FX_WCHAR));
- FXSYS_memcpy(m_pData->m_String + str1.GetLength(), str2.raw_str(),
+ FXSYS_memcpy(m_pData->m_String + str1.GetLength(), str2.c_str(),
str2.GetLength() * sizeof(FX_WCHAR));
}
}
@@ -151,7 +151,7 @@ const CFX_WideString& CFX_WideString::operator=(
if (stringSrc.IsEmpty()) {
Empty();
} else {
- AssignCopy(stringSrc.GetLength(), stringSrc.raw_str());
+ AssignCopy(stringSrc.GetLength(), stringSrc.c_str());
}
return *this;
}
@@ -195,7 +195,7 @@ const CFX_WideString& CFX_WideString::operator+=(const CFX_WideStringC& str) {
if (str.IsEmpty()) {
return *this;
}
- ConcatInPlace(str.GetLength(), str.raw_str());
+ ConcatInPlace(str.GetLength(), str.c_str());
return *this;
}
bool CFX_WideString::operator==(const wchar_t* ptr) const {
@@ -213,7 +213,7 @@ bool CFX_WideString::operator==(const CFX_WideStringC& str) const {
return str.IsEmpty();
return str.GetLength() == m_pData->m_nDataLength &&
- wmemcmp(str.raw_str(), m_pData->m_String, m_pData->m_nDataLength) == 0;
+ wmemcmp(str.c_str(), m_pData->m_String, m_pData->m_nDataLength) == 0;
}
bool CFX_WideString::operator==(const CFX_WideString& other) const {
if (IsEmpty())
diff --git a/core/fxcrt/fxcrt_windows.cpp b/core/fxcrt/fxcrt_windows.cpp
index 8c7c0d8176..eb584ca804 100644
--- a/core/fxcrt/fxcrt_windows.cpp
+++ b/core/fxcrt/fxcrt_windows.cpp
@@ -61,7 +61,7 @@ FX_BOOL CFXCRT_FileAccess_Win64::Open(const CFX_WideStringC& fileName,
}
uint32_t dwAccess, dwShare, dwCreation;
FXCRT_Windows_GetFileMode(dwMode, dwAccess, dwShare, dwCreation);
- m_hFile = ::CreateFileW((LPCWSTR)fileName.raw_str(), dwAccess, dwShare, NULL,
+ m_hFile = ::CreateFileW((LPCWSTR)fileName.c_str(), dwAccess, dwShare, NULL,
dwCreation, FILE_ATTRIBUTE_NORMAL, NULL);
if (m_hFile == INVALID_HANDLE_VALUE) {
m_hFile = NULL;
diff --git a/core/fxcrt/include/fx_string.h b/core/fxcrt/include/fx_string.h
index e084f50cfd..f5b431e62c 100644
--- a/core/fxcrt/include/fx_string.h
+++ b/core/fxcrt/include/fx_string.h
@@ -413,7 +413,7 @@ class CFX_WideStringC {
bool operator!=(const wchar_t* ptr) const { return !(*this == ptr); }
bool operator!=(const CFX_WideStringC& str) const { return !(*this == str); }
- const FX_WCHAR* raw_str() const { return m_Ptr; }
+ const FX_WCHAR* c_str() const { return m_Ptr; }
FX_STRSIZE GetLength() const { return m_Length; }
bool IsEmpty() const { return m_Length == 0; }
@@ -715,7 +715,7 @@ inline bool operator!=(const CFX_WideStringC& lhs, const CFX_WideString& rhs) {
CFX_ByteString FX_UTF8Encode(const FX_WCHAR* pwsStr, FX_STRSIZE len);
inline CFX_ByteString FX_UTF8Encode(const CFX_WideStringC& wsStr) {
- return FX_UTF8Encode(wsStr.raw_str(), wsStr.GetLength());
+ return FX_UTF8Encode(wsStr.c_str(), wsStr.GetLength());
}
inline CFX_ByteString FX_UTF8Encode(const CFX_WideString& wsStr) {
return FX_UTF8Encode(wsStr.c_str(), wsStr.GetLength());
@@ -723,7 +723,7 @@ inline CFX_ByteString FX_UTF8Encode(const CFX_WideString& wsStr) {
FX_FLOAT FX_atof(const CFX_ByteStringC& str);
inline FX_FLOAT FX_atof(const CFX_WideStringC& wsStr) {
- return FX_atof(FX_UTF8Encode(wsStr.raw_str(), wsStr.GetLength()).c_str());
+ return FX_atof(FX_UTF8Encode(wsStr.c_str(), wsStr.GetLength()).c_str());
}
void FX_atonum(const CFX_ByteStringC& str, FX_BOOL& bInteger, void* pData);
FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_CHAR* buf);