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/formfiller | |
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/formfiller')
-rw-r--r-- | fpdfsdk/formfiller/cffl_checkbox.cpp | 4 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_checkbox.h | 2 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_combobox.cpp | 4 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_combobox.h | 2 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_formfiller.cpp | 6 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_formfiller.h | 10 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_iformfiller.cpp | 4 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_iformfiller.h | 6 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_listbox.cpp | 4 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_listbox.h | 2 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_pushbutton.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_pushbutton.h | 2 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_radiobutton.cpp | 4 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_radiobutton.h | 2 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_textfield.cpp | 4 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_textfield.h | 2 |
16 files changed, 30 insertions, 30 deletions
diff --git a/fpdfsdk/formfiller/cffl_checkbox.cpp b/fpdfsdk/formfiller/cffl_checkbox.cpp index 3455cded60..df5e7bfbca 100644 --- a/fpdfsdk/formfiller/cffl_checkbox.cpp +++ b/fpdfsdk/formfiller/cffl_checkbox.cpp @@ -7,12 +7,12 @@ #include "fpdfsdk/formfiller/cffl_checkbox.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" -#include "fpdfsdk/include/cpdfdoc_environment.h" +#include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/cpdfsdk_widget.h" #include "fpdfsdk/pdfwindow/PWL_SpecialButton.h" #include "public/fpdf_fwlevent.h" -CFFL_CheckBox::CFFL_CheckBox(CPDFDoc_Environment* pApp, CPDFSDK_Widget* pWidget) +CFFL_CheckBox::CFFL_CheckBox(CPDFSDK_Environment* pApp, CPDFSDK_Widget* pWidget) : CFFL_Button(pApp, pWidget) {} CFFL_CheckBox::~CFFL_CheckBox() {} diff --git a/fpdfsdk/formfiller/cffl_checkbox.h b/fpdfsdk/formfiller/cffl_checkbox.h index 01f6e3bee4..9dd0827356 100644 --- a/fpdfsdk/formfiller/cffl_checkbox.h +++ b/fpdfsdk/formfiller/cffl_checkbox.h @@ -11,7 +11,7 @@ class CFFL_CheckBox : public CFFL_Button { public: - CFFL_CheckBox(CPDFDoc_Environment* pApp, CPDFSDK_Widget* pWidget); + CFFL_CheckBox(CPDFSDK_Environment* pApp, CPDFSDK_Widget* pWidget); ~CFFL_CheckBox() override; // CFFL_Button diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp index 3eea1e4fcc..7ff09b7948 100644 --- a/fpdfsdk/formfiller/cffl_combobox.cpp +++ b/fpdfsdk/formfiller/cffl_combobox.cpp @@ -9,12 +9,12 @@ #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/formfiller/cffl_iformfiller.h" -#include "fpdfsdk/include/cpdfdoc_environment.h" +#include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/cpdfsdk_widget.h" #include "fpdfsdk/include/fsdk_common.h" #include "fpdfsdk/pdfwindow/PWL_ComboBox.h" -CFFL_ComboBox::CFFL_ComboBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot) +CFFL_ComboBox::CFFL_ComboBox(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot) : CFFL_FormFiller(pApp, pAnnot), m_pFontMap(nullptr) { m_State.nIndex = 0; m_State.nStart = 0; diff --git a/fpdfsdk/formfiller/cffl_combobox.h b/fpdfsdk/formfiller/cffl_combobox.h index 6b8fb4939b..b9e7430636 100644 --- a/fpdfsdk/formfiller/cffl_combobox.h +++ b/fpdfsdk/formfiller/cffl_combobox.h @@ -21,7 +21,7 @@ struct FFL_ComboBoxState { class CFFL_ComboBox : public CFFL_FormFiller, public IPWL_FocusHandler { public: - CFFL_ComboBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pWidget); + CFFL_ComboBox(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pWidget); ~CFFL_ComboBox() override; // CFFL_FormFiller: diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp index 595f4121f3..99fc0808ff 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.cpp +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp @@ -9,8 +9,8 @@ #include "core/fpdfapi/fpdf_page/include/cpdf_page.h" #include "core/fxge/include/cfx_renderdevice.h" #include "fpdfsdk/formfiller/cba_fontmap.h" -#include "fpdfsdk/include/cpdfdoc_environment.h" #include "fpdfsdk/include/cpdfsdk_document.h" +#include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/cpdfsdk_pageview.h" #include "fpdfsdk/include/cpdfsdk_widget.h" #include "fpdfsdk/include/fsdk_common.h" @@ -22,7 +22,7 @@ #define FFL_HINT_ELAPSE 800 -CFFL_FormFiller::CFFL_FormFiller(CPDFDoc_Environment* pApp, +CFFL_FormFiller::CFFL_FormFiller(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot) : m_pApp(pApp), m_pAnnot(pAnnot), m_bValid(FALSE) { m_pWidget = static_cast<CPDFSDK_Widget*>(pAnnot); @@ -618,7 +618,7 @@ void CFFL_FormFiller::InvalidateRect(double left, m_pApp->FFI_Invalidate(pPage, left, top, right, bottom); } -CFFL_Button::CFFL_Button(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pWidget) +CFFL_Button::CFFL_Button(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pWidget) : CFFL_FormFiller(pApp, pWidget), m_bMouseIn(FALSE), m_bMouseDown(FALSE) {} CFFL_Button::~CFFL_Button() {} diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h index d691e3f6ce..6a41185c39 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.h +++ b/fpdfsdk/formfiller/cffl_formfiller.h @@ -13,14 +13,14 @@ #include "fpdfsdk/formfiller/cffl_iformfiller.h" #include "fpdfsdk/include/pdfsdk_fieldaction.h" -class CPDFDoc_Environment; class CPDFSDK_Annot; +class CPDFSDK_Environment; class CPDFSDK_PageView; class CPDFSDK_Widget; class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { public: - CFFL_FormFiller(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot); + CFFL_FormFiller(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot); ~CFFL_FormFiller() override; virtual FX_RECT GetViewBBox(CPDFSDK_PageView* pPageView, @@ -146,7 +146,7 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { double top, double right, double bottom); - CPDFDoc_Environment* GetApp() { return m_pApp; } + CPDFSDK_Environment* GetApp() { return m_pApp; } CPDFSDK_Annot* GetSDKAnnot() { return m_pAnnot; } protected: @@ -160,7 +160,7 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { // until the PWL_Edit is done with it. pdfium:566 void DestroyWindows(); - CPDFDoc_Environment* m_pApp; + CPDFSDK_Environment* m_pApp; CPDFSDK_Widget* m_pWidget; CPDFSDK_Annot* m_pAnnot; @@ -171,7 +171,7 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { class CFFL_Button : public CFFL_FormFiller { public: - CFFL_Button(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pWidget); + CFFL_Button(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pWidget); ~CFFL_Button() override; // CFFL_FormFiller diff --git a/fpdfsdk/formfiller/cffl_iformfiller.cpp b/fpdfsdk/formfiller/cffl_iformfiller.cpp index d7ccaf217a..09e0109d79 100644 --- a/fpdfsdk/formfiller/cffl_iformfiller.cpp +++ b/fpdfsdk/formfiller/cffl_iformfiller.cpp @@ -18,8 +18,8 @@ #include "fpdfsdk/formfiller/cffl_pushbutton.h" #include "fpdfsdk/formfiller/cffl_radiobutton.h" #include "fpdfsdk/formfiller/cffl_textfield.h" -#include "fpdfsdk/include/cpdfdoc_environment.h" #include "fpdfsdk/include/cpdfsdk_document.h" +#include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/cpdfsdk_interform.h" #include "fpdfsdk/include/cpdfsdk_pageview.h" #include "fpdfsdk/include/cpdfsdk_widget.h" @@ -27,7 +27,7 @@ #define FFL_MAXLISTBOXHEIGHT 140.0f -CFFL_IFormFiller::CFFL_IFormFiller(CPDFDoc_Environment* pApp) +CFFL_IFormFiller::CFFL_IFormFiller(CPDFSDK_Environment* pApp) : m_pApp(pApp), m_bNotifying(FALSE) {} CFFL_IFormFiller::~CFFL_IFormFiller() {} diff --git a/fpdfsdk/formfiller/cffl_iformfiller.h b/fpdfsdk/formfiller/cffl_iformfiller.h index 36cf19dd64..26638f8334 100644 --- a/fpdfsdk/formfiller/cffl_iformfiller.h +++ b/fpdfsdk/formfiller/cffl_iformfiller.h @@ -14,14 +14,14 @@ #include "fpdfsdk/pdfwindow/PWL_Edit.h" class CFFL_FormFiller; -class CPDFDoc_Environment; +class CPDFSDK_Environment; class CPDFSDK_Annot; class CPDFSDK_PageView; class CPDFSDK_Widget; class CFFL_IFormFiller : public IPWL_Filler_Notify { public: - explicit CFFL_IFormFiller(CPDFDoc_Environment* pApp); + explicit CFFL_IFormFiller(CPDFSDK_Environment* pApp); ~CFFL_IFormFiller() override; virtual FX_BOOL Annot_HitTest(CPDFSDK_PageView* pPageView, @@ -171,7 +171,7 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { #endif // PDF_ENABLE_XFA void UnRegisterFormFiller(CPDFSDK_Annot* pAnnot); - CPDFDoc_Environment* const m_pApp; + CPDFSDK_Environment* const m_pApp; CFFL_Widget2Filler m_Maps; FX_BOOL m_bNotifying; }; diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp index 39b766a62c..e9627cb4e4 100644 --- a/fpdfsdk/formfiller/cffl_listbox.cpp +++ b/fpdfsdk/formfiller/cffl_listbox.cpp @@ -9,14 +9,14 @@ #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/formfiller/cffl_iformfiller.h" -#include "fpdfsdk/include/cpdfdoc_environment.h" +#include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/cpdfsdk_widget.h" #include "fpdfsdk/include/fsdk_common.h" #include "fpdfsdk/pdfwindow/PWL_ListBox.h" #define FFL_DEFAULTLISTBOXFONTSIZE 12.0f -CFFL_ListBox::CFFL_ListBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pWidget) +CFFL_ListBox::CFFL_ListBox(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pWidget) : CFFL_FormFiller(pApp, pWidget) {} CFFL_ListBox::~CFFL_ListBox() {} diff --git a/fpdfsdk/formfiller/cffl_listbox.h b/fpdfsdk/formfiller/cffl_listbox.h index 4d1f64f113..29d0884af0 100644 --- a/fpdfsdk/formfiller/cffl_listbox.h +++ b/fpdfsdk/formfiller/cffl_listbox.h @@ -16,7 +16,7 @@ class CBA_FontMap; class CFFL_ListBox : public CFFL_FormFiller { public: - CFFL_ListBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pWidget); + CFFL_ListBox(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pWidget); ~CFFL_ListBox() override; // CFFL_FormFiller diff --git a/fpdfsdk/formfiller/cffl_pushbutton.cpp b/fpdfsdk/formfiller/cffl_pushbutton.cpp index d8da65a383..630b2d52d1 100644 --- a/fpdfsdk/formfiller/cffl_pushbutton.cpp +++ b/fpdfsdk/formfiller/cffl_pushbutton.cpp @@ -9,7 +9,7 @@ #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/pdfwindow/PWL_SpecialButton.h" -CFFL_PushButton::CFFL_PushButton(CPDFDoc_Environment* pApp, +CFFL_PushButton::CFFL_PushButton(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot) : CFFL_Button(pApp, pAnnot) {} diff --git a/fpdfsdk/formfiller/cffl_pushbutton.h b/fpdfsdk/formfiller/cffl_pushbutton.h index 9292a76266..cc49ed8332 100644 --- a/fpdfsdk/formfiller/cffl_pushbutton.h +++ b/fpdfsdk/formfiller/cffl_pushbutton.h @@ -11,7 +11,7 @@ class CFFL_PushButton : public CFFL_Button { public: - CFFL_PushButton(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot); + CFFL_PushButton(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot); ~CFFL_PushButton() override; // CFFL_Button diff --git a/fpdfsdk/formfiller/cffl_radiobutton.cpp b/fpdfsdk/formfiller/cffl_radiobutton.cpp index 752baadf5e..ddb3d2765d 100644 --- a/fpdfsdk/formfiller/cffl_radiobutton.cpp +++ b/fpdfsdk/formfiller/cffl_radiobutton.cpp @@ -7,12 +7,12 @@ #include "fpdfsdk/formfiller/cffl_radiobutton.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" -#include "fpdfsdk/include/cpdfdoc_environment.h" +#include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/cpdfsdk_widget.h" #include "fpdfsdk/pdfwindow/PWL_SpecialButton.h" #include "public/fpdf_fwlevent.h" -CFFL_RadioButton::CFFL_RadioButton(CPDFDoc_Environment* pApp, +CFFL_RadioButton::CFFL_RadioButton(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pWidget) : CFFL_Button(pApp, pWidget) {} diff --git a/fpdfsdk/formfiller/cffl_radiobutton.h b/fpdfsdk/formfiller/cffl_radiobutton.h index f008d1b40f..52b1276e3a 100644 --- a/fpdfsdk/formfiller/cffl_radiobutton.h +++ b/fpdfsdk/formfiller/cffl_radiobutton.h @@ -11,7 +11,7 @@ class CFFL_RadioButton : public CFFL_Button { public: - CFFL_RadioButton(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot); + CFFL_RadioButton(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot); ~CFFL_RadioButton() override; // CFFL_Button diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp index 15bfbc841c..842c37bbf9 100644 --- a/fpdfsdk/formfiller/cffl_textfield.cpp +++ b/fpdfsdk/formfiller/cffl_textfield.cpp @@ -7,11 +7,11 @@ #include "fpdfsdk/formfiller/cffl_textfield.h" #include "fpdfsdk/formfiller/cba_fontmap.h" -#include "fpdfsdk/include/cpdfdoc_environment.h" +#include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/cpdfsdk_widget.h" #include "fpdfsdk/include/fsdk_common.h" -CFFL_TextField::CFFL_TextField(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot) +CFFL_TextField::CFFL_TextField(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot) : CFFL_FormFiller(pApp, pAnnot) {} CFFL_TextField::~CFFL_TextField() { diff --git a/fpdfsdk/formfiller/cffl_textfield.h b/fpdfsdk/formfiller/cffl_textfield.h index 5f9fc5d3bc..717f6d3c61 100644 --- a/fpdfsdk/formfiller/cffl_textfield.h +++ b/fpdfsdk/formfiller/cffl_textfield.h @@ -27,7 +27,7 @@ struct FFL_TextFieldState { class CFFL_TextField : public CFFL_FormFiller, public IPWL_FocusHandler { public: - CFFL_TextField(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot); + CFFL_TextField(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot); ~CFFL_TextField() override; // CFFL_FormFiller: |