diff options
author | Hans Wennborg <hans@chromium.org> | 2018-10-22 18:28:52 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-22 18:28:52 +0000 |
commit | c320e9c7ad01ab48625e51fb3b6476d98b6167de (patch) | |
tree | 4ef9b9083a5969b60c445340a47500c46c5ce623 /fpdfsdk/formfiller/cffl_interactiveformfiller.cpp | |
parent | 8298d25cf3ac41d71a8533700d929cadac1c360d (diff) | |
download | pdfium-c320e9c7ad01ab48625e51fb3b6476d98b6167de.tar.xz |
Add k prefixes to CPDF_AAction::AActionType enumerators
The GetFocus enumerator was shadowing the GetFocus function in winuser.h.
Change the enumerators to all have a k prefix to avoid the warning, and since I
believe pdfium wants to move towards that style anyway.
Bug: chromium:895475
Change-Id: I740afa4f29d895e7e3cbb488fd311a7487d67a82
Reviewed-on: https://pdfium-review.googlesource.com/c/44470
Commit-Queue: Hans Wennborg <hans@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk/formfiller/cffl_interactiveformfiller.cpp')
-rw-r--r-- | fpdfsdk/formfiller/cffl_interactiveformfiller.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp index 3d5590af6d..c712610dcc 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp @@ -118,7 +118,7 @@ void CFFL_InteractiveFormFiller::OnMouseEnter( ASSERT((*pAnnot)->GetPDFAnnot()->GetSubtype() == CPDF_Annot::Subtype::WIDGET); if (!m_bNotifying) { CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); - if (pWidget->GetAAction(CPDF_AAction::CursorEnter).GetDict()) { + if (pWidget->GetAAction(CPDF_AAction::kCursorEnter).GetDict()) { m_bNotifying = true; uint32_t nValueAge = pWidget->GetValueAge(); @@ -128,7 +128,7 @@ void CFFL_InteractiveFormFiller::OnMouseEnter( CPDFSDK_FieldAction fa; fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag); fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag); - pWidget->OnAAction(CPDF_AAction::CursorEnter, &fa, pPageView); + pWidget->OnAAction(CPDF_AAction::kCursorEnter, &fa, pPageView); m_bNotifying = false; if (!pAnnot->HasObservable()) return; @@ -151,7 +151,7 @@ void CFFL_InteractiveFormFiller::OnMouseExit(CPDFSDK_PageView* pPageView, ASSERT((*pAnnot)->GetPDFAnnot()->GetSubtype() == CPDF_Annot::Subtype::WIDGET); if (!m_bNotifying) { CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); - if (pWidget->GetAAction(CPDF_AAction::CursorExit).GetDict()) { + if (pWidget->GetAAction(CPDF_AAction::kCursorExit).GetDict()) { m_bNotifying = true; uint32_t nValueAge = pWidget->GetValueAge(); @@ -161,7 +161,7 @@ void CFFL_InteractiveFormFiller::OnMouseExit(CPDFSDK_PageView* pPageView, CPDFSDK_FieldAction fa; fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag); fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag); - pWidget->OnAAction(CPDF_AAction::CursorExit, &fa, pPageView); + pWidget->OnAAction(CPDF_AAction::kCursorExit, &fa, pPageView); m_bNotifying = false; if (!pAnnot->HasObservable()) return; @@ -187,7 +187,7 @@ bool CFFL_InteractiveFormFiller::OnLButtonDown( if (!m_bNotifying) { CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); if (Annot_HitTest(pPageView, pAnnot->Get(), point) && - pWidget->GetAAction(CPDF_AAction::ButtonDown).GetDict()) { + pWidget->GetAAction(CPDF_AAction::kButtonDown).GetDict()) { m_bNotifying = true; uint32_t nValueAge = pWidget->GetValueAge(); @@ -197,7 +197,7 @@ bool CFFL_InteractiveFormFiller::OnLButtonDown( CPDFSDK_FieldAction fa; fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlags); fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlags); - pWidget->OnAAction(CPDF_AAction::ButtonDown, &fa, pPageView); + pWidget->OnAAction(CPDF_AAction::kButtonDown, &fa, pPageView); m_bNotifying = false; if (!pAnnot->HasObservable()) return true; @@ -263,7 +263,7 @@ bool CFFL_InteractiveFormFiller::OnButtonUp(CPDFSDK_Annot::ObservedPtr* pAnnot, return false; CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); - if (!pWidget->GetAAction(CPDF_AAction::ButtonUp).GetDict()) + if (!pWidget->GetAAction(CPDF_AAction::kButtonUp).GetDict()) return false; m_bNotifying = true; @@ -275,7 +275,7 @@ bool CFFL_InteractiveFormFiller::OnButtonUp(CPDFSDK_Annot::ObservedPtr* pAnnot, CPDFSDK_FieldAction fa; fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag); fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag); - pWidget->OnAAction(CPDF_AAction::ButtonUp, &fa, pPageView); + pWidget->OnAAction(CPDF_AAction::kButtonUp, &fa, pPageView); m_bNotifying = false; if (!pAnnot->HasObservable() || !IsValidAnnot(pPageView, pWidget)) return true; @@ -371,7 +371,7 @@ bool CFFL_InteractiveFormFiller::OnSetFocus(CPDFSDK_Annot::ObservedPtr* pAnnot, ASSERT((*pAnnot)->GetPDFAnnot()->GetSubtype() == CPDF_Annot::Subtype::WIDGET); if (!m_bNotifying) { CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); - if (pWidget->GetAAction(CPDF_AAction::GetFocus).GetDict()) { + if (pWidget->GetAAction(CPDF_AAction::kGetFocus).GetDict()) { m_bNotifying = true; uint32_t nValueAge = pWidget->GetValueAge(); @@ -387,8 +387,8 @@ bool CFFL_InteractiveFormFiller::OnSetFocus(CPDFSDK_Annot::ObservedPtr* pAnnot, CPDFSDK_FieldAction fa; fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag); fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag); - pFormFiller->GetActionData(pPageView, CPDF_AAction::GetFocus, fa); - pWidget->OnAAction(CPDF_AAction::GetFocus, &fa, pPageView); + pFormFiller->GetActionData(pPageView, CPDF_AAction::kGetFocus, fa); + pWidget->OnAAction(CPDF_AAction::kGetFocus, &fa, pPageView); m_bNotifying = false; if (!pAnnot->HasObservable()) return false; @@ -426,7 +426,7 @@ bool CFFL_InteractiveFormFiller::OnKillFocus(CPDFSDK_Annot::ObservedPtr* pAnnot, return true; CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); - if (!pWidget->GetAAction(CPDF_AAction::LoseFocus).GetDict()) + if (!pWidget->GetAAction(CPDF_AAction::kLoseFocus).GetDict()) return true; m_bNotifying = true; @@ -438,8 +438,8 @@ bool CFFL_InteractiveFormFiller::OnKillFocus(CPDFSDK_Annot::ObservedPtr* pAnnot, CPDFSDK_FieldAction fa; fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag); fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag); - pFormFiller->GetActionData(pPageView, CPDF_AAction::LoseFocus, fa); - pWidget->OnAAction(CPDF_AAction::LoseFocus, &fa, pPageView); + pFormFiller->GetActionData(pPageView, CPDF_AAction::kLoseFocus, fa); + pWidget->OnAAction(CPDF_AAction::kLoseFocus, &fa, pPageView); m_bNotifying = false; return pAnnot->HasObservable(); } @@ -638,7 +638,7 @@ bool CFFL_InteractiveFormFiller::OnKeyStrokeCommit( return true; CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); - if (!pWidget->GetAAction(CPDF_AAction::KeyStroke).GetDict()) + if (!pWidget->GetAAction(CPDF_AAction::kKeyStroke).GetDict()) return true; ASSERT(pPageView); @@ -653,9 +653,9 @@ bool CFFL_InteractiveFormFiller::OnKeyStrokeCommit( fa.bRC = true; CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, false); - pFormFiller->GetActionData(pPageView, CPDF_AAction::KeyStroke, fa); + pFormFiller->GetActionData(pPageView, CPDF_AAction::kKeyStroke, fa); pFormFiller->SaveState(pPageView); - pWidget->OnAAction(CPDF_AAction::KeyStroke, &fa, pPageView); + pWidget->OnAAction(CPDF_AAction::kKeyStroke, &fa, pPageView); if (!pAnnot->HasObservable()) return true; @@ -670,7 +670,7 @@ bool CFFL_InteractiveFormFiller::OnValidate(CPDFSDK_Annot::ObservedPtr* pAnnot, return true; CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); - if (!pWidget->GetAAction(CPDF_AAction::Validate).GetDict()) + if (!pWidget->GetAAction(CPDF_AAction::kValidate).GetDict()) return true; ASSERT(pPageView); @@ -684,9 +684,9 @@ bool CFFL_InteractiveFormFiller::OnValidate(CPDFSDK_Annot::ObservedPtr* pAnnot, fa.bRC = true; CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, false); - pFormFiller->GetActionData(pPageView, CPDF_AAction::Validate, fa); + pFormFiller->GetActionData(pPageView, CPDF_AAction::kValidate, fa); pFormFiller->SaveState(pPageView); - pWidget->OnAAction(CPDF_AAction::Validate, &fa, pPageView); + pWidget->OnAAction(CPDF_AAction::kValidate, &fa, pPageView); if (!pAnnot->HasObservable()) return true; @@ -907,7 +907,7 @@ std::pair<bool, bool> CFFL_InteractiveFormFiller::OnBeforeKeyStroke( #endif // PDF_ENABLE_XFA if (m_bNotifying || - !privateData.pWidget->GetAAction(CPDF_AAction::KeyStroke).GetDict()) { + !privateData.pWidget->GetAAction(CPDF_AAction::kKeyStroke).GetDict()) { return {true, false}; } @@ -929,13 +929,13 @@ std::pair<bool, bool> CFFL_InteractiveFormFiller::OnBeforeKeyStroke( fa.bRC = true; fa.nSelStart = nSelStart; fa.nSelEnd = nSelEnd; - pFormFiller->GetActionData(privateData.pPageView, CPDF_AAction::KeyStroke, + pFormFiller->GetActionData(privateData.pPageView, CPDF_AAction::kKeyStroke, fa); pFormFiller->SaveState(privateData.pPageView); CPDFSDK_Annot::ObservedPtr pObserved(privateData.pWidget); bool action_status = privateData.pWidget->OnAAction( - CPDF_AAction::KeyStroke, &fa, privateData.pPageView); + CPDF_AAction::kKeyStroke, &fa, privateData.pPageView); if (!pObserved || !IsValidAnnot(privateData.pPageView, privateData.pWidget)) return {true, true}; @@ -953,7 +953,7 @@ std::pair<bool, bool> CFFL_InteractiveFormFiller::OnBeforeKeyStroke( bExit = true; } if (fa.bRC) { - pFormFiller->SetActionData(privateData.pPageView, CPDF_AAction::KeyStroke, + pFormFiller->SetActionData(privateData.pPageView, CPDF_AAction::kKeyStroke, fa); } else { pFormFiller->RestoreState(privateData.pPageView); |