Form: add A to some constructor parameters to avoid shadow warnings
diff --git a/poppler/Form.cc b/poppler/Form.cc
index 66f31a1..a5454c8 100644
--- a/poppler/Form.cc
+++ b/poppler/Form.cc
@@ -177,8 +177,8 @@
return widget ? widget->getFormAdditionalAction(t) : nullptr;
}
-FormWidgetButton::FormWidgetButton (PDFDoc *docA, Object *aobj, unsigned num, Ref ref, FormField *p) :
- FormWidget(docA, aobj, num, ref, p)
+FormWidgetButton::FormWidgetButton (PDFDoc *docA, Object *aobj, unsigned num, Ref refA, FormField *p) :
+ FormWidget(docA, aobj, num, refA, p)
{
type = formButton;
onStr = nullptr;
@@ -256,8 +256,8 @@
}
-FormWidgetText::FormWidgetText (PDFDoc *docA, Object *aobj, unsigned num, Ref ref, FormField *p) :
- FormWidget(docA, aobj, num, ref, p)
+FormWidgetText::FormWidgetText (PDFDoc *docA, Object *aobj, unsigned num, Ref refA, FormField *p) :
+ FormWidget(docA, aobj, num, refA, p)
{
type = formText;
}
@@ -333,8 +333,8 @@
return static_cast<FormFieldText*>(field);
}
-FormWidgetChoice::FormWidgetChoice(PDFDoc *docA, Object *aobj, unsigned num, Ref ref, FormField *p) :
- FormWidget(docA, aobj, num, ref, p)
+FormWidgetChoice::FormWidgetChoice(PDFDoc *docA, Object *aobj, unsigned num, Ref refA, FormField *p) :
+ FormWidget(docA, aobj, num, refA, p)
{
type = formChoice;
}
@@ -445,8 +445,8 @@
return static_cast<FormFieldChoice*>(field);
}
-FormWidgetSignature::FormWidgetSignature(PDFDoc *docA, Object *aobj, unsigned num, Ref ref, FormField *p) :
- FormWidget(docA, aobj, num, ref, p)
+FormWidgetSignature::FormWidgetSignature(PDFDoc *docA, Object *aobj, unsigned num, Ref refA, FormField *p) :
+ FormWidget(docA, aobj, num, refA, p)
{
type = formSignature;
}
@@ -964,8 +964,8 @@
//------------------------------------------------------------------------
// FormFieldButton
//------------------------------------------------------------------------
-FormFieldButton::FormFieldButton(PDFDoc *docA, Object &&aobj, const Ref ref, FormField *parent, std::set<int> *usedParents)
- : FormField(docA, std::move(aobj), ref, parent, usedParents, formButton)
+FormFieldButton::FormFieldButton(PDFDoc *docA, Object &&aobj, const Ref refA, FormField *parentA, std::set<int> *usedParents)
+ : FormField(docA, std::move(aobj), refA, parentA, usedParents, formButton)
{
Dict* dict = obj.getDict();
active_child = -1;
@@ -1134,8 +1134,8 @@
//------------------------------------------------------------------------
// FormFieldText
//------------------------------------------------------------------------
-FormFieldText::FormFieldText(PDFDoc *docA, Object &&aobj, const Ref ref, FormField *parent, std::set<int> *usedParents)
- : FormField(docA, std::move(aobj), ref, parent, usedParents, formText)
+FormFieldText::FormFieldText(PDFDoc *docA, Object &&aobj, const Ref refA, FormField *parentA, std::set<int> *usedParents)
+ : FormField(docA, std::move(aobj), refA, parentA, usedParents, formText)
{
Dict* dict = obj.getDict();
Object obj1;
@@ -1306,8 +1306,8 @@
//------------------------------------------------------------------------
// FormFieldChoice
//------------------------------------------------------------------------
-FormFieldChoice::FormFieldChoice(PDFDoc *docA, Object &&aobj, const Ref ref, FormField *parent, std::set<int> *usedParents)
- : FormField(docA, std::move(aobj), ref, parent, usedParents, formChoice)
+FormFieldChoice::FormFieldChoice(PDFDoc *docA, Object &&aobj, const Ref refA, FormField *parentA, std::set<int> *usedParents)
+ : FormField(docA, std::move(aobj), refA, parentA, usedParents, formChoice)
{
numChoices = 0;
choices = nullptr;
@@ -1598,8 +1598,8 @@
//------------------------------------------------------------------------
// FormFieldSignature
//------------------------------------------------------------------------
-FormFieldSignature::FormFieldSignature(PDFDoc *docA, Object &&dict, const Ref ref, FormField *parent, std::set<int> *usedParents)
- : FormField(docA, std::move(dict), ref, parent, usedParents, formSignature),
+FormFieldSignature::FormFieldSignature(PDFDoc *docA, Object &&dict, const Ref refA, FormField *parentA, std::set<int> *usedParents)
+ : FormField(docA, std::move(dict), refA, parentA, usedParents, formSignature),
signature_type(adbe_pkcs7_detached),
signature(nullptr), signature_info(nullptr)
{
