diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-08 17:25:42 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-08 17:25:42 -0700 |
| commit | bf6c2a4873f8cc12ad910fb904218a78087a3735 (patch) | |
| tree | 80a54fa87004f3aa065c451f1fb830734b3a6d2d /fpdfsdk/include | |
| parent | 2a824f1c0ed786aed0dd15a0ea60dc90999e2b2c (diff) | |
| download | pdfium-bf6c2a4873f8cc12ad910fb904218a78087a3735.tar.xz | |
Remove more cruft from fx_system.h
- include system headers first and alphabetize.
- remove unsupported FX_WIN32_MOBILE symbol.
- actually define a FX_WIN64 symbol and make consistent.
- use final/override, not FX_FINAL.
- let stdint.h resolve FX_WORDSIZE concerns.
- unused FX_ERR and FX_SUCCESS() macros.
- unused FX_LSB_FIRST macro.
- outline FX type deprecation plan.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1169963003
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/fsdk_define.h | 8 | ||||
| -rw-r--r-- | fpdfsdk/include/fsdk_mgr.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index 8a839ab74d..f3ff066bd4 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -67,17 +67,17 @@ typedef unsigned int FX_UINT; #include "../../public/fpdfview.h" -class CPDF_CustomAccess FX_FINAL : public IFX_FileRead +class CPDF_CustomAccess final : public IFX_FileRead { public: CPDF_CustomAccess(FPDF_FILEACCESS* pFileAccess); ~CPDF_CustomAccess() {} - virtual FX_FILESIZE GetSize() FX_OVERRIDE { return m_FileAccess.m_FileLen; } + virtual FX_FILESIZE GetSize() override { return m_FileAccess.m_FileLen; } - virtual void Release() FX_OVERRIDE { delete this; } + virtual void Release() override { delete this; } - virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) FX_OVERRIDE; + virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override; private: FPDF_FILEACCESS m_FileAccess; diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 4b7cc56373..04a26cf209 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -28,7 +28,7 @@ class CJS_RuntimeFactory; #include "javascript/IJavaScript.h" -class CPDFDoc_Environment FX_FINAL +class CPDFDoc_Environment final { public: CPDFDoc_Environment(CPDF_Document * pDoc); @@ -414,7 +414,7 @@ private: CPDF_OCContext * m_pOccontent; FX_BOOL m_bChangeMask; }; -class CPDFSDK_PageView FX_FINAL +class CPDFSDK_PageView final { public: CPDFSDK_PageView(CPDFSDK_Document* pSDKDoc,CPDF_Page* page); |