Annot: Rename three type to a longer more qualified name
Fixes shadow warnings
diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index c6d07b4..4d6bd5d 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -3784,14 +3784,14 @@
updatedAppearanceStream = Ref::INVALID();
}
-LinkAction* AnnotWidget::getAdditionalAction(AdditionalActionsType type)
+LinkAction* AnnotWidget::getAdditionalAction(AdditionalActionsType additionalActionType)
{
- return ::getAdditionalAction(type, &additionalActions, doc);
+ return ::getAdditionalAction(additionalActionType, &additionalActions, doc);
}
-LinkAction* AnnotWidget::getFormAdditionalAction(FormAdditionalActionsType type)
+LinkAction* AnnotWidget::getFormAdditionalAction(FormAdditionalActionsType formAdditionalActionType)
{
- return ::getFormAdditionalAction(type, &additionalActions, doc);
+ return ::getFormAdditionalAction(formAdditionalActionType, &additionalActions, doc);
}
// Grand unified handler for preparing text strings to be drawn into form
@@ -5160,12 +5160,12 @@
}
}
-LinkAction* AnnotScreen::getAdditionalAction(AdditionalActionsType type)
+LinkAction* AnnotScreen::getAdditionalAction(AdditionalActionsType additionalActionType)
{
- if (type == actionFocusIn || type == actionFocusOut) // not defined for screen annotation
+ if (additionalActionType == actionFocusIn || additionalActionType == actionFocusOut) // not defined for screen annotation
return nullptr;
- return ::getAdditionalAction(type, &additionalActions, doc);
+ return ::getAdditionalAction(additionalActionType, &additionalActions, doc);
}
//------------------------------------------------------------------------
