summaryrefslogtreecommitdiff
path: root/core/include/fxcrt/fx_string.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-06-10 11:09:44 -0700
committerTom Sepez <tsepez@chromium.org>2015-06-10 11:09:44 -0700
commitfbf266fc0ea4be2523cbb901a641aa33f0035662 (patch)
treed0e5eda4d3c220818903eca76bc2ca835a1851d0 /core/include/fxcrt/fx_string.h
parent3c949d5d2b0d680839766ea99c86b263230b263d (diff)
downloadpdfium-fbf266fc0ea4be2523cbb901a641aa33f0035662.tar.xz
Remove typdefs for pointer types in fx_system.h.
This involves fixing some multiple variable per line declarations, as the textually-substituted "*" applies only to the first one. This involves moving some consts around following the substitution. This involves replacing some typedefs used as constructors with better code. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1171733003
Diffstat (limited to 'core/include/fxcrt/fx_string.h')
-rw-r--r--core/include/fxcrt/fx_string.h128
1 files changed, 64 insertions, 64 deletions
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h
index 8fc9d79ebb..5923ffdf2d 100644
--- a/core/include/fxcrt/fx_string.h
+++ b/core/include/fxcrt/fx_string.h
@@ -31,15 +31,15 @@ public:
m_Length = 0;
}
- CFX_ByteStringC(FX_LPCBYTE ptr, FX_STRSIZE size)
+ CFX_ByteStringC(const uint8_t* ptr, FX_STRSIZE size)
{
m_Ptr = ptr;
m_Length = size;
}
- CFX_ByteStringC(FX_LPCSTR ptr)
+ CFX_ByteStringC(const FX_CHAR* ptr)
{
- m_Ptr = (FX_LPCBYTE)ptr;
+ m_Ptr = (const uint8_t*)ptr;
m_Length = ptr ? FXSYS_strlen(ptr) : 0;
}
@@ -52,13 +52,13 @@ public:
// TODO(tsepez): Mark single-argument string constructors as explicit.
CFX_ByteStringC(FX_CHAR& ch)
{
- m_Ptr = (FX_LPCBYTE)&ch;
+ m_Ptr = (const uint8_t*)&ch;
m_Length = 1;
}
- CFX_ByteStringC(FX_LPCSTR ptr, FX_STRSIZE len)
+ CFX_ByteStringC(const FX_CHAR* ptr, FX_STRSIZE len)
{
- m_Ptr = (FX_LPCBYTE)ptr;
+ m_Ptr = (const uint8_t*)ptr;
m_Length = (len == -1) ? FXSYS_strlen(ptr) : len;
}
@@ -70,9 +70,9 @@ public:
CFX_ByteStringC(const CFX_ByteString& src);
- CFX_ByteStringC& operator = (FX_LPCSTR src)
+ CFX_ByteStringC& operator = (const FX_CHAR* src)
{
- m_Ptr = (FX_LPCBYTE)src;
+ m_Ptr = (const uint8_t*)src;
m_Length = m_Ptr ? FXSYS_strlen(src) : 0;
return *this;
}
@@ -101,14 +101,14 @@ public:
FX_DWORD GetID(FX_STRSIZE start_pos = 0) const;
- FX_LPCBYTE GetPtr() const
+ const uint8_t* GetPtr() const
{
return m_Ptr;
}
- FX_LPCSTR GetCStr() const
+ const FX_CHAR* GetCStr() const
{
- return (FX_LPCSTR)m_Ptr;
+ return (const FX_CHAR*)m_Ptr;
}
FX_STRSIZE GetLength() const
@@ -152,7 +152,7 @@ public:
}
protected:
- FX_LPCBYTE m_Ptr;
+ const uint8_t* m_Ptr;
FX_STRSIZE m_Length;
private:
@@ -190,36 +190,36 @@ public:
}
CFX_ByteString(char ch);
- CFX_ByteString(FX_LPCSTR ptr)
+ CFX_ByteString(const FX_CHAR* ptr)
: CFX_ByteString(ptr, ptr ? FXSYS_strlen(ptr) : 0) { }
- CFX_ByteString(FX_LPCSTR ptr, FX_STRSIZE len);
- CFX_ByteString(FX_LPCBYTE ptr, FX_STRSIZE len);
+ CFX_ByteString(const FX_CHAR* ptr, FX_STRSIZE len);
+ CFX_ByteString(const uint8_t* ptr, FX_STRSIZE len);
CFX_ByteString(FX_BSTR bstrc);
CFX_ByteString(FX_BSTR bstrc1, FX_BSTR bstrc2);
~CFX_ByteString();
- static CFX_ByteString FromUnicode(FX_LPCWSTR ptr, FX_STRSIZE len = -1);
+ static CFX_ByteString FromUnicode(const FX_WCHAR* ptr, FX_STRSIZE len = -1);
static CFX_ByteString FromUnicode(const CFX_WideString& str);
// Explicit conversion to raw string
- FX_LPCSTR c_str() const
+ const FX_CHAR* c_str() const
{
return m_pData ? m_pData->m_String : "";
}
// Implicit conversion to C-style string -- deprecated
- operator FX_LPCSTR() const
+ operator const FX_CHAR*() const
{
return m_pData ? m_pData->m_String : "";
}
- operator FX_LPCBYTE() const
+ operator const uint8_t*() const
{
- return m_pData ? (FX_LPCBYTE)m_pData->m_String : NULL;
+ return m_pData ? (const uint8_t*)m_pData->m_String : NULL;
}
FX_STRSIZE GetLength() const
@@ -261,7 +261,7 @@ public:
void Empty();
- const CFX_ByteString& operator = (FX_LPCSTR str);
+ const CFX_ByteString& operator = (const FX_CHAR* str);
const CFX_ByteString& operator = (FX_BSTR bstrc);
@@ -269,11 +269,11 @@ public:
const CFX_ByteString& operator = (const CFX_BinaryBuf& buf);
- void Load(FX_LPCBYTE str, FX_STRSIZE len);
+ void Load(const uint8_t* str, FX_STRSIZE len);
const CFX_ByteString& operator += (FX_CHAR ch);
- const CFX_ByteString& operator += (FX_LPCSTR str);
+ const CFX_ByteString& operator += (const FX_CHAR* str);
const CFX_ByteString& operator += (const CFX_ByteString& str);
@@ -296,14 +296,14 @@ public:
FX_STRSIZE Delete(FX_STRSIZE index, FX_STRSIZE count = 1);
- void Format(FX_LPCSTR lpszFormat, ... );
+ void Format(const FX_CHAR* lpszFormat, ... );
- void FormatV(FX_LPCSTR lpszFormat, va_list argList);
+ void FormatV(const FX_CHAR* lpszFormat, va_list argList);
void Reserve(FX_STRSIZE len);
- FX_LPSTR GetBuffer(FX_STRSIZE len);
+ FX_CHAR* GetBuffer(FX_STRSIZE len);
void ReleaseBuffer(FX_STRSIZE len = -1);
@@ -384,9 +384,9 @@ protected:
};
void AllocCopy(CFX_ByteString& dest, FX_STRSIZE nCopyLen, FX_STRSIZE nCopyIndex) const;
- void AssignCopy(FX_STRSIZE nSrcLen, FX_LPCSTR lpszSrcData);
- void ConcatCopy(FX_STRSIZE nSrc1Len, FX_LPCSTR lpszSrc1Data, FX_STRSIZE nSrc2Len, FX_LPCSTR lpszSrc2Data);
- void ConcatInPlace(FX_STRSIZE nSrcLen, FX_LPCSTR lpszSrcData);
+ void AssignCopy(FX_STRSIZE nSrcLen, const FX_CHAR* lpszSrcData);
+ void ConcatCopy(FX_STRSIZE nSrc1Len, const FX_CHAR* lpszSrc1Data, FX_STRSIZE nSrc2Len, const FX_CHAR* lpszSrc2Data);
+ void ConcatInPlace(FX_STRSIZE nSrcLen, const FX_CHAR* lpszSrcData);
void CopyBeforeWrite();
void AllocBeforeWrite(FX_STRSIZE nLen);
@@ -395,12 +395,12 @@ protected:
};
inline CFX_ByteStringC::CFX_ByteStringC(const CFX_ByteString& src)
{
- m_Ptr = (FX_LPCBYTE)src;
+ m_Ptr = (const uint8_t*)src;
m_Length = src.GetLength();
}
inline CFX_ByteStringC& CFX_ByteStringC::operator = (const CFX_ByteString& src)
{
- m_Ptr = (FX_LPCBYTE)src;
+ m_Ptr = (const uint8_t*)src;
m_Length = src.GetLength();
return *this;
}
@@ -422,11 +422,11 @@ inline CFX_ByteString operator + (FX_BSTR str1, FX_BSTR str2)
{
return CFX_ByteString(str1, str2);
}
-inline CFX_ByteString operator + (FX_BSTR str1, FX_LPCSTR str2)
+inline CFX_ByteString operator + (FX_BSTR str1, const FX_CHAR* str2)
{
return CFX_ByteString(str1, str2);
}
-inline CFX_ByteString operator + (FX_LPCSTR str1, FX_BSTR str2)
+inline CFX_ByteString operator + (const FX_CHAR* str1, FX_BSTR str2)
{
return CFX_ByteString(str1, str2);
}
@@ -450,11 +450,11 @@ inline CFX_ByteString operator + (FX_CHAR ch, const CFX_ByteString& str2)
{
return CFX_ByteString(ch, str2);
}
-inline CFX_ByteString operator + (const CFX_ByteString& str1, FX_LPCSTR str2)
+inline CFX_ByteString operator + (const CFX_ByteString& str1, const FX_CHAR* str2)
{
return CFX_ByteString(str1, str2);
}
-inline CFX_ByteString operator + (FX_LPCSTR str1, const CFX_ByteString& str2)
+inline CFX_ByteString operator + (const FX_CHAR* str1, const CFX_ByteString& str2)
{
return CFX_ByteString(str1, str2);
}
@@ -477,7 +477,7 @@ public:
m_Length = 0;
}
- CFX_WideStringC(FX_LPCWSTR ptr)
+ CFX_WideStringC(const FX_WCHAR* ptr)
{
m_Ptr = ptr;
m_Length = ptr ? FXSYS_wcslen(ptr) : 0;
@@ -489,7 +489,7 @@ public:
m_Length = 1;
}
- CFX_WideStringC(FX_LPCWSTR ptr, FX_STRSIZE len)
+ CFX_WideStringC(const FX_WCHAR* ptr, FX_STRSIZE len)
{
m_Ptr = ptr;
m_Length = (len == -1) ? FXSYS_wcslen(ptr) : len;
@@ -503,7 +503,7 @@ public:
CFX_WideStringC(const CFX_WideString& src);
- CFX_WideStringC& operator = (FX_LPCWSTR src)
+ CFX_WideStringC& operator = (const FX_WCHAR* src)
{
m_Ptr = src;
m_Length = FXSYS_wcslen(src);
@@ -532,7 +532,7 @@ public:
return !(*this == str);
}
- FX_LPCWSTR GetPtr() const
+ const FX_WCHAR* GetPtr() const
{
return m_Ptr;
}
@@ -600,7 +600,7 @@ public:
}
protected:
- FX_LPCWSTR m_Ptr;
+ const FX_WCHAR* m_Ptr;
FX_STRSIZE m_Length;
private:
@@ -636,10 +636,10 @@ public:
other.m_pData = nullptr;
}
- CFX_WideString(FX_LPCWSTR ptr)
+ CFX_WideString(const FX_WCHAR* ptr)
: CFX_WideString(ptr, ptr ? FXSYS_wcslen(ptr) : 0) { }
- CFX_WideString(FX_LPCWSTR ptr, FX_STRSIZE len);
+ CFX_WideString(const FX_WCHAR* ptr, FX_STRSIZE len);
CFX_WideString(FX_WCHAR ch);
@@ -658,13 +658,13 @@ public:
static FX_STRSIZE WStringLength(const unsigned short* str);
// Explicit conversion to raw string
- FX_LPCWSTR c_str() const
+ const FX_WCHAR* c_str() const
{
return m_pData ? m_pData->m_String : L"";
}
// Implicit conversion to C-style wide string -- deprecated
- operator FX_LPCWSTR() const
+ operator const FX_WCHAR*() const
{
return m_pData ? m_pData->m_String : L"";
}
@@ -682,13 +682,13 @@ public:
return m_pData ? m_pData->m_nDataLength : 0;
}
- const CFX_WideString& operator = (FX_LPCWSTR str);
+ const CFX_WideString& operator = (const FX_WCHAR* str);
const CFX_WideString& operator =(const CFX_WideString& stringSrc);
const CFX_WideString& operator =(const CFX_WideStringC& stringSrc);
- const CFX_WideString& operator += (FX_LPCWSTR str);
+ const CFX_WideString& operator += (const FX_WCHAR* str);
const CFX_WideString& operator += (FX_WCHAR ch);
@@ -725,11 +725,11 @@ public:
void SetAt(FX_STRSIZE nIndex, FX_WCHAR ch);
- int Compare(FX_LPCWSTR str) const;
+ int Compare(const FX_WCHAR* str) const;
int Compare(const CFX_WideString& str) const;
- int CompareNoCase(FX_LPCWSTR str) const;
+ int CompareNoCase(const FX_WCHAR* str) const;
bool Equal(const wchar_t* ptr) const;
bool Equal(const CFX_WideStringC& str) const;
@@ -747,9 +747,9 @@ public:
FX_STRSIZE Delete(FX_STRSIZE index, FX_STRSIZE count = 1);
- void Format(FX_LPCWSTR lpszFormat, ... );
+ void Format(const FX_WCHAR* lpszFormat, ... );
- void FormatV(FX_LPCWSTR lpszFormat, va_list argList);
+ void FormatV(const FX_WCHAR* lpszFormat, va_list argList);
void MakeLower();
@@ -759,17 +759,17 @@ public:
void TrimRight(FX_WCHAR chTarget);
- void TrimRight(FX_LPCWSTR lpszTargets);
+ void TrimRight(const FX_WCHAR* lpszTargets);
void TrimLeft();
void TrimLeft(FX_WCHAR chTarget);
- void TrimLeft(FX_LPCWSTR lpszTargets);
+ void TrimLeft(const FX_WCHAR* lpszTargets);
void Reserve(FX_STRSIZE len);
- FX_LPWSTR GetBuffer(FX_STRSIZE len);
+ FX_WCHAR* GetBuffer(FX_STRSIZE len);
void ReleaseBuffer(FX_STRSIZE len = -1);
@@ -777,11 +777,11 @@ public:
FX_FLOAT GetFloat() const;
- FX_STRSIZE Find(FX_LPCWSTR lpszSub, FX_STRSIZE start = 0) const;
+ FX_STRSIZE Find(const FX_WCHAR* lpszSub, FX_STRSIZE start = 0) const;
FX_STRSIZE Find(FX_WCHAR ch, FX_STRSIZE start = 0) const;
- FX_STRSIZE Replace(FX_LPCWSTR lpszOld, FX_LPCWSTR lpszNew);
+ FX_STRSIZE Replace(const FX_WCHAR* lpszOld, const FX_WCHAR* lpszNew);
FX_STRSIZE Remove(FX_WCHAR ch);
@@ -816,9 +816,9 @@ protected:
void CopyBeforeWrite();
void AllocBeforeWrite(FX_STRSIZE nLen);
- void ConcatInPlace(FX_STRSIZE nSrcLen, FX_LPCWSTR lpszSrcData);
- void ConcatCopy(FX_STRSIZE nSrc1Len, FX_LPCWSTR lpszSrc1Data, FX_STRSIZE nSrc2Len, FX_LPCWSTR lpszSrc2Data);
- void AssignCopy(FX_STRSIZE nSrcLen, FX_LPCWSTR lpszSrcData);
+ void ConcatInPlace(FX_STRSIZE nSrcLen, const FX_WCHAR* lpszSrcData);
+ void ConcatCopy(FX_STRSIZE nSrc1Len, const FX_WCHAR* lpszSrc1Data, FX_STRSIZE nSrc2Len, const FX_WCHAR* lpszSrc2Data);
+ void AssignCopy(FX_STRSIZE nSrcLen, const FX_WCHAR* lpszSrcData);
void AllocCopy(CFX_WideString& dest, FX_STRSIZE nCopyLen, FX_STRSIZE nCopyIndex) const;
StringData* m_pData;
@@ -840,11 +840,11 @@ inline CFX_WideString operator + (const CFX_WideStringC& str1, const CFX_WideStr
{
return CFX_WideString(str1, str2);
}
-inline CFX_WideString operator + (const CFX_WideStringC& str1, FX_LPCWSTR str2)
+inline CFX_WideString operator + (const CFX_WideStringC& str1, const FX_WCHAR* str2)
{
return CFX_WideString(str1, str2);
}
-inline CFX_WideString operator + (FX_LPCWSTR str1, const CFX_WideStringC& str2)
+inline CFX_WideString operator + (const FX_WCHAR* str1, const CFX_WideStringC& str2)
{
return CFX_WideString(str1, str2);
}
@@ -868,11 +868,11 @@ inline CFX_WideString operator + (FX_WCHAR ch, const CFX_WideString& str2)
{
return CFX_WideString(ch, str2);
}
-inline CFX_WideString operator + (const CFX_WideString& str1, FX_LPCWSTR str2)
+inline CFX_WideString operator + (const CFX_WideString& str1, const FX_WCHAR* str2)
{
return CFX_WideString(str1, str2);
}
-inline CFX_WideString operator + (FX_LPCWSTR str1, const CFX_WideString& str2)
+inline CFX_WideString operator + (const FX_WCHAR* str1, const CFX_WideString& str2)
{
return CFX_WideString(str1, str2);
}
@@ -898,8 +898,8 @@ inline bool operator!= (const CFX_WideStringC& lhs, const CFX_WideString& rhs) {
}
FX_FLOAT FX_atof(FX_BSTR str);
void FX_atonum(FX_BSTR str, FX_BOOL& bInteger, void* pData);
-FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_LPSTR buf);
-CFX_ByteString FX_UTF8Encode(FX_LPCWSTR pwsStr, FX_STRSIZE len);
+FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_CHAR* buf);
+CFX_ByteString FX_UTF8Encode(const FX_WCHAR* pwsStr, FX_STRSIZE len);
inline CFX_ByteString FX_UTF8Encode(FX_WSTR wsStr)
{
return FX_UTF8Encode(wsStr.GetPtr(), wsStr.GetLength());