diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-10 11:09:44 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-10 11:09:44 -0700 |
| commit | fbf266fc0ea4be2523cbb901a641aa33f0035662 (patch) | |
| tree | d0e5eda4d3c220818903eca76bc2ca835a1851d0 /core/include/fpdfdoc | |
| parent | 3c949d5d2b0d680839766ea99c86b263230b263d (diff) | |
| download | pdfium-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/fpdfdoc')
| -rw-r--r-- | core/include/fpdfdoc/fpdf_doc.h | 8 | ||||
| -rw-r--r-- | core/include/fpdfdoc/fpdf_vt.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index 13fd41f432..b46579ac88 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -727,7 +727,7 @@ public: static FX_BOOL UpdatingAPEnabled(); - static CFX_ByteString GenerateNewResourceName(const CPDF_Dictionary* pResDict, FX_LPCSTR csType, int iMinLen = 2, FX_LPCSTR csPrefix = ""); + static CFX_ByteString GenerateNewResourceName(const CPDF_Dictionary* pResDict, const FX_CHAR* csType, int iMinLen = 2, const FX_CHAR* csPrefix = ""); @@ -739,9 +739,9 @@ public: static CPDF_Font* AddStandardFont(const CPDF_Document* pDocument, CFX_ByteString csFontName); - static CFX_ByteString GetNativeFont(uint8_t iCharSet, FX_LPVOID pLogFont = NULL); + static CFX_ByteString GetNativeFont(uint8_t iCharSet, void* pLogFont = NULL); - static CFX_ByteString GetNativeFont(FX_LPVOID pLogFont = NULL); + static CFX_ByteString GetNativeFont(void* pLogFont = NULL); static uint8_t GetNativeCharSet(); @@ -1543,7 +1543,7 @@ public: CXML_Element* GetRDF() const; protected: - FX_LPVOID m_pData; + void* m_pData; }; class CPDF_ViewerPreferences { diff --git a/core/include/fpdfdoc/fpdf_vt.h b/core/include/fpdfdoc/fpdf_vt.h index fbfeacb755..1fec0e629a 100644 --- a/core/include/fpdfdoc/fpdf_vt.h +++ b/core/include/fpdfdoc/fpdf_vt.h @@ -375,7 +375,7 @@ public: virtual void ResetAll() = 0; - virtual void SetText(FX_LPCWSTR text, int32_t charset = 1, const CPVT_SecProps * pSecProps = NULL, + virtual void SetText(const FX_WCHAR* text, int32_t charset = 1, const CPVT_SecProps * pSecProps = NULL, const CPVT_WordProps * pWordProps = NULL) = 0; virtual CPVT_WordPlace InsertWord(const CPVT_WordPlace & place, FX_WORD word, int32_t charset = 1, @@ -384,7 +384,7 @@ public: virtual CPVT_WordPlace InsertSection(const CPVT_WordPlace & place, const CPVT_SecProps * pSecProps = NULL, const CPVT_WordProps * pWordProps = NULL) = 0; - virtual CPVT_WordPlace InsertText(const CPVT_WordPlace & place, FX_LPCWSTR text, int32_t charset = 1, + virtual CPVT_WordPlace InsertText(const CPVT_WordPlace & place, const FX_WCHAR* text, int32_t charset = 1, const CPVT_SecProps * pSecProps = NULL, const CPVT_WordProps * pWordProps = NULL) = 0; virtual CPVT_WordPlace DeleteWords(const CPVT_WordRange & PlaceRange) = 0; |