diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2018-01-04 14:43:27 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-04 20:19:41 +0000 |
| commit | c560a8c11a6f8ee239e570db8c022ae0fd2a4db5 (patch) | |
| tree | 0c16389f7e5c5e29c57a9c7f77dd062fa07d8640 /xfa/fxfa/parser/cxfa_node.h | |
| parent | df0a749452d933e4f434e2a33112667f1880db34 (diff) | |
| download | pdfium-c560a8c11a6f8ee239e570db8c022ae0fd2a4db5.tar.xz | |
Convert usages of pdfium::Optional to Optional
Change-Id: I29769f78eaad10c6a8b79e27524336c4f330377e
Reviewed-on: https://pdfium-review.googlesource.com/22258
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_node.h')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index e6683b24dc..cc8d5e8f8d 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -65,7 +65,7 @@ class CXFA_Node : public CXFA_Object { #endif // NDEBUG static WideString AttributeEnumToName(XFA_AttributeEnum item); - static pdfium::Optional<XFA_AttributeEnum> NameToAttributeEnum( + static Optional<XFA_AttributeEnum> NameToAttributeEnum( const WideStringView& name); static XFA_Attribute NameToAttribute(const WideStringView& name); static WideString AttributeToName(XFA_Attribute attr); @@ -210,12 +210,11 @@ class CXFA_Node : public CXFA_Object { CXFA_Occur* GetOccur(); - pdfium::Optional<bool> GetDefaultBoolean(XFA_Attribute attr) const; - pdfium::Optional<int32_t> GetDefaultInteger(XFA_Attribute attr) const; - pdfium::Optional<CXFA_Measurement> GetDefaultMeasurement( - XFA_Attribute attr) const; - pdfium::Optional<WideString> GetDefaultCData(XFA_Attribute attr) const; - pdfium::Optional<XFA_AttributeEnum> GetDefaultEnum(XFA_Attribute attr) const; + Optional<bool> GetDefaultBoolean(XFA_Attribute attr) const; + Optional<int32_t> GetDefaultInteger(XFA_Attribute attr) const; + Optional<CXFA_Measurement> GetDefaultMeasurement(XFA_Attribute attr) const; + Optional<WideString> GetDefaultCData(XFA_Attribute attr) const; + Optional<XFA_AttributeEnum> GetDefaultEnum(XFA_Attribute attr) const; void SyncValue(const WideString& wsValue, bool bNotify); @@ -243,10 +242,10 @@ class CXFA_Node : public CXFA_Object { CXFA_Node* Deprecated_GetPrevSibling(); const PropertyData* GetPropertyData(XFA_Element property) const; const AttributeData* GetAttributeData(XFA_Attribute attr) const; - pdfium::Optional<XFA_Element> GetFirstPropertyWithFlag(uint8_t flag); + Optional<XFA_Element> GetFirstPropertyWithFlag(uint8_t flag); void OnRemoved(bool bNotify); - pdfium::Optional<void*> GetDefaultValue(XFA_Attribute attr, - XFA_AttributeType eType) const; + Optional<void*> GetDefaultValue(XFA_Attribute attr, + XFA_AttributeType eType) const; CXFA_Node* GetChildInternal(int32_t index, XFA_Element eType, bool bOnlyChild); |