diff options
author | dsinclair <dsinclair@chromium.org> | 2016-09-14 07:27:21 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-09-14 07:27:21 -0700 |
commit | 79db609948b01d7a27824b74acc4bd22c8bfd17b (patch) | |
tree | 30708102a7abfbe5b40638935042ccf6a5b55c0c /fpdfsdk/include | |
parent | a440bb3f11f42b7a22624e9771dd8d9c57075f06 (diff) | |
download | pdfium-79db609948b01d7a27824b74acc4bd22c8bfd17b.tar.xz |
Rename CPDFDoc_Environment to CPDFSDK_Environment
CPDFDoc_Environment does not fit with the general naming scheme of the rest of
the files in fpdfsdk. This CL updates the naming to CPDFSDK_Environment to
better fit with the surrounding files.
Review-Url: https://codereview.chromium.org/2333413003
Diffstat (limited to 'fpdfsdk/include')
-rw-r--r-- | fpdfsdk/include/cpdfsdk_annothandlermgr.h | 6 | ||||
-rw-r--r-- | fpdfsdk/include/cpdfsdk_baannothandler.h | 2 | ||||
-rw-r--r-- | fpdfsdk/include/cpdfsdk_document.h | 8 | ||||
-rw-r--r-- | fpdfsdk/include/cpdfsdk_environment.h (renamed from fpdfsdk/include/cpdfdoc_environment.h) | 12 | ||||
-rw-r--r-- | fpdfsdk/include/cpdfsdk_widgethandler.h | 6 | ||||
-rw-r--r-- | fpdfsdk/include/cpdfsdk_xfawidgethandler.h | 6 |
6 files changed, 20 insertions, 20 deletions
diff --git a/fpdfsdk/include/cpdfsdk_annothandlermgr.h b/fpdfsdk/include/cpdfsdk_annothandlermgr.h index f4be66a432..d79fc067f6 100644 --- a/fpdfsdk/include/cpdfsdk_annothandlermgr.h +++ b/fpdfsdk/include/cpdfsdk_annothandlermgr.h @@ -16,7 +16,7 @@ class CFX_Matrix; class CFX_RenderDevice; -class CPDFDoc_Environment; +class CPDFSDK_Environment; class CPDFSDK_Annot; class CPDFSDK_BAAnnotHandler; class CPDFSDK_WidgetHandler; @@ -30,7 +30,7 @@ class CXFA_FFWidget; class CPDFSDK_AnnotHandlerMgr { public: - explicit CPDFSDK_AnnotHandlerMgr(CPDFDoc_Environment* pApp); + explicit CPDFSDK_AnnotHandlerMgr(CPDFSDK_Environment* pApp); virtual ~CPDFSDK_AnnotHandlerMgr(); virtual CPDFSDK_Annot* NewAnnot(CPDF_Annot* pAnnot, @@ -118,7 +118,7 @@ class CPDFSDK_AnnotHandlerMgr { std::unique_ptr<CPDFSDK_XFAWidgetHandler> m_pXFAWidgetHandler; #endif // PDF_ENABLE_XFA - CPDFDoc_Environment* m_pApp; + CPDFSDK_Environment* m_pApp; }; #endif // FPDFSDK_INCLUDE_CPDFSDK_ANNOTHANDLERMGR_H_ diff --git a/fpdfsdk/include/cpdfsdk_baannothandler.h b/fpdfsdk/include/cpdfsdk_baannothandler.h index ba50df3ccb..1e04bc15c2 100644 --- a/fpdfsdk/include/cpdfsdk_baannothandler.h +++ b/fpdfsdk/include/cpdfsdk_baannothandler.h @@ -15,7 +15,7 @@ class CFFL_IFormFiller; class CFX_Matrix; class CFX_RenderDevice; class CPDF_Annot; -class CPDFDoc_Environment; +class CPDFSDK_Environment; class CPDFSDK_Annot; class CPDFSDK_PageView; diff --git a/fpdfsdk/include/cpdfsdk_document.h b/fpdfsdk/include/cpdfsdk_document.h index 610fb1781d..9f6ac79202 100644 --- a/fpdfsdk/include/cpdfsdk_document.h +++ b/fpdfsdk/include/cpdfsdk_document.h @@ -16,7 +16,7 @@ #include "public/fpdf_formfill.h" class CPDF_OCContext; -class CPDFDoc_Environment; +class CPDFSDK_Environment; class CPDFSDK_Annot; class CPDFSDK_InterForm; class CPDFSDK_PageView; @@ -26,7 +26,7 @@ class CPDFSDK_Document : public CFX_Observable<CPDFSDK_Document> { public: static CPDFSDK_Document* FromFPDFFormHandle(FPDF_FORMHANDLE hHandle); - CPDFSDK_Document(UnderlyingDocumentType* pDoc, CPDFDoc_Environment* pEnv); + CPDFSDK_Document(UnderlyingDocumentType* pDoc, CPDFSDK_Environment* pEnv); ~CPDFSDK_Document(); CPDFSDK_InterForm* GetInterForm(); @@ -89,7 +89,7 @@ class CPDFSDK_Document : public CFX_Observable<CPDFSDK_Document> { void ClearChangeMark() { m_bChangeMask = FALSE; } CFX_WideString GetPath(); UnderlyingPageType* GetPage(int nIndex); - CPDFDoc_Environment* GetEnv() { return m_pEnv; } + CPDFSDK_Environment* GetEnv() { return m_pEnv; } void ProcJavascriptFun(); FX_BOOL ProcOpenAction(); CPDF_OCContext* GetOCContext(); @@ -99,7 +99,7 @@ class CPDFSDK_Document : public CFX_Observable<CPDFSDK_Document> { UnderlyingDocumentType* m_pDoc; std::unique_ptr<CPDFSDK_InterForm> m_pInterForm; CPDFSDK_Annot* m_pFocusAnnot; - CPDFDoc_Environment* m_pEnv; + CPDFSDK_Environment* m_pEnv; std::unique_ptr<CPDF_OCContext> m_pOccontent; FX_BOOL m_bChangeMask; FX_BOOL m_bBeingDestroyed; diff --git a/fpdfsdk/include/cpdfdoc_environment.h b/fpdfsdk/include/cpdfsdk_environment.h index 2d29e11a92..7fd146a043 100644 --- a/fpdfsdk/include/cpdfdoc_environment.h +++ b/fpdfsdk/include/cpdfsdk_environment.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFDOC_ENVIRONMENT_H_ -#define FPDFSDK_INCLUDE_CPDFDOC_ENVIRONMENT_H_ +#ifndef FPDFSDK_INCLUDE_CPDFSDK_ENVIRONMENT_H_ +#define FPDFSDK_INCLUDE_CPDFSDK_ENVIRONMENT_H_ #include <memory> @@ -25,10 +25,10 @@ class CPDFSDK_AnnotHandlerMgr; class CPDFSDK_Document; class IJS_Runtime; -class CPDFDoc_Environment final { +class CPDFSDK_Environment final { public: - CPDFDoc_Environment(UnderlyingDocumentType* pDoc, FPDF_FORMFILLINFO* pFFinfo); - ~CPDFDoc_Environment(); + CPDFSDK_Environment(UnderlyingDocumentType* pDoc, FPDF_FORMFILLINFO* pFFinfo); + ~CPDFSDK_Environment(); void FFI_Invalidate(FPDF_PAGE page, double left, @@ -432,4 +432,4 @@ class CPDFDoc_Environment final { std::unique_ptr<CFX_SystemHandler> m_pSysHandler; }; -#endif // FPDFSDK_INCLUDE_CPDFDOC_ENVIRONMENT_H_ +#endif // FPDFSDK_INCLUDE_CPDFSDK_ENVIRONMENT_H_ diff --git a/fpdfsdk/include/cpdfsdk_widgethandler.h b/fpdfsdk/include/cpdfsdk_widgethandler.h index d34510d092..432a90bc24 100644 --- a/fpdfsdk/include/cpdfsdk_widgethandler.h +++ b/fpdfsdk/include/cpdfsdk_widgethandler.h @@ -15,8 +15,8 @@ class CFFL_IFormFiller; class CFX_Matrix; class CFX_RenderDevice; class CPDF_Annot; -class CPDFDoc_Environment; class CPDFSDK_Annot; +class CPDFSDK_Environment; class CPDFSDK_PageView; #ifdef PDF_ENABLE_XFA @@ -25,7 +25,7 @@ class CXFA_FFWidget; class CPDFSDK_WidgetHandler : public IPDFSDK_AnnotHandler { public: - explicit CPDFSDK_WidgetHandler(CPDFDoc_Environment* pApp); + explicit CPDFSDK_WidgetHandler(CPDFSDK_Environment* pApp); ~CPDFSDK_WidgetHandler() override; FX_BOOL CanAnswer(CPDFSDK_Annot* pAnnot) override; @@ -107,7 +107,7 @@ class CPDFSDK_WidgetHandler : public IPDFSDK_AnnotHandler { CFFL_IFormFiller* GetFormFiller() { return m_pFormFiller; } private: - CPDFDoc_Environment* m_pApp; + CPDFSDK_Environment* m_pApp; CFFL_IFormFiller* m_pFormFiller; }; diff --git a/fpdfsdk/include/cpdfsdk_xfawidgethandler.h b/fpdfsdk/include/cpdfsdk_xfawidgethandler.h index dec2675ed8..9ad7784ef3 100644 --- a/fpdfsdk/include/cpdfsdk_xfawidgethandler.h +++ b/fpdfsdk/include/cpdfsdk_xfawidgethandler.h @@ -14,7 +14,7 @@ class CFX_Matrix; class CFX_RenderDevice; class CPDF_Annot; -class CPDFDoc_Environment; +class CPDFSDK_Environment; class CPDFSDK_Annot; class CPDFSDK_PageView; class CXFA_FFWidget; @@ -22,7 +22,7 @@ class CXFA_FFWidgetHandler; class CPDFSDK_XFAWidgetHandler : public IPDFSDK_AnnotHandler { public: - explicit CPDFSDK_XFAWidgetHandler(CPDFDoc_Environment* pApp); + explicit CPDFSDK_XFAWidgetHandler(CPDFSDK_Environment* pApp); ~CPDFSDK_XFAWidgetHandler() override; FX_BOOL CanAnswer(CPDFSDK_Annot* pAnnot) override; @@ -100,7 +100,7 @@ class CPDFSDK_XFAWidgetHandler : public IPDFSDK_AnnotHandler { CXFA_FFWidgetHandler* GetXFAWidgetHandler(CPDFSDK_Annot* pAnnot); uint32_t GetFWLFlags(uint32_t dwFlag); - CPDFDoc_Environment* m_pApp; + CPDFSDK_Environment* m_pApp; }; #endif // FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGETHANDLER_H_ |