Tidy ifdefs in fpdfsdk.

fpdfsdk/include/fsdk_baseform.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 #define FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 
 #if _FX_OS_ == _FX_ANDROID_
@@ skipping 20 matching lines @@
 class CPDF_FormField;
 struct CPWL_Color;
 
 #ifdef PDF_ENABLE_XFA
 typedef enum _PDFSDK_XFAAActionType {
   PDFSDK_XFA_Click = 0,
   PDFSDK_XFA_Full,
   PDFSDK_XFA_PreOpen,
   PDFSDK_XFA_PostOpen
 } PDFSDK_XFAAActionType;
+#endif  // PDF_ENABLE_XFA
 
-#endif
 typedef struct _PDFSDK_FieldAction {
   _PDFSDK_FieldAction() {
     bModifier = FALSE;
     bShift = FALSE;
     nCommitKey = 0;
     bKeyDown = FALSE;
     nSelEnd = nSelStart = 0;
     bWillCommit = FALSE;
     bFieldFull = FALSE;
     bRC = TRUE;
@@ skipping 30 matching lines @@
   void SynchronizeXFAItems();
 
   static void SynchronizeXFAValue(IXFA_DocView* pXFADocView,
                                   IXFA_Widget* hWidget,
                                   CPDF_FormField* pFormField,
                                   CPDF_FormControl* pFormControl);
   static void SynchronizeXFAItems(IXFA_DocView* pXFADocView,
                                   IXFA_Widget* hWidget,
                                   CPDF_FormField* pFormField,
                                   CPDF_FormControl* pFormControl);
+#endif  // PDF_ENABLE_XFA
 
-#endif
   CPDFSDK_Widget(CPDF_Annot* pAnnot,
                  CPDFSDK_PageView* pPageView,
                  CPDFSDK_InterForm* pInterForm);
   ~CPDFSDK_Widget() override;
 
   // CPDFSDK_Annot
   CFX_ByteString GetSubType() const override;
   CPDF_Action GetAAction(CPDF_AAction::AActionType eAAT) override;
   FX_BOOL IsAppearanceValid() override;
 
@@ skipping 11 matching lines @@
   FX_BOOL GetFillColor(FX_COLORREF& color) const;
   FX_BOOL GetBorderColor(FX_COLORREF& color) const;
   FX_BOOL GetTextColor(FX_COLORREF& color) const;
   FX_FLOAT GetFontSize() const;
 
   int GetSelectedIndex(int nIndex) const;
 #ifndef PDF_ENABLE_XFA
   CFX_WideString GetValue() const;
 #else
   CFX_WideString GetValue(FX_BOOL bDisplay = TRUE) const;
-#endif
+#endif  // PDF_ENABLE_XFA
   CFX_WideString GetDefaultValue() const;
   CFX_WideString GetOptionLabel(int nIndex) const;
   int CountOptions() const;
   FX_BOOL IsOptionSelected(int nIndex) const;
   int GetTopVisibleIndex() const;
   FX_BOOL IsChecked() const;
   /*
   BF_ALIGN_LEFT
   BF_ALIGN_MIDDL
   BF_ALIGN_RIGHT
   */
   int GetAlignment() const;
   int GetMaxLen() const;
 #ifdef PDF_ENABLE_XFA
   CFX_WideString GetName() const;
-#endif
+#endif  // PDF_ENABLE_XFA
   CFX_WideString GetAlternateName() const;
 
   // Set Properties.
   void SetCheck(FX_BOOL bChecked, FX_BOOL bNotify);
   void SetValue(const CFX_WideString& sValue, FX_BOOL bNotify);
   void SetDefaultValue(const CFX_WideString& sValue);
   void SetOptionSelection(int index, FX_BOOL bSelected, FX_BOOL bNotify);
   void ClearSelection(FX_BOOL bNotify);
   void SetTopVisibleIndex(int index);
 
 #ifdef PDF_ENABLE_XFA
   void ResetAppearance(FX_BOOL bValueChanged);
-#endif
+#endif  // PDF_ENABLE_XFA
   void ResetAppearance(const FX_WCHAR* sValue, FX_BOOL bValueChanged);
   void ResetFieldAppearance(FX_BOOL bValueChanged);
   void UpdateField();
   CFX_WideString OnFormat(FX_BOOL& bFormated);
 
   // Message.
   FX_BOOL OnAAction(CPDF_AAction::AActionType type,
                     PDFSDK_FieldAction& data,
                     CPDFSDK_PageView* pPageView);
 
@@ skipping 38 matching lines @@
   FX_BOOL IsWidgetAppearanceValid(CPDF_Annot::AppearanceMode mode);
   void DrawAppearance(CFX_RenderDevice* pDevice,
                       const CPDF_Matrix* pUser2Device,
                       CPDF_Annot::AppearanceMode mode,
                       const CPDF_RenderOptions* pOptions) override;
 
   FX_BOOL HitTest(FX_FLOAT pageX, FX_FLOAT pageY);
 
 #ifndef PDF_ENABLE_XFA
  private:
-#endif
+#endif  // PDF_ENABLE_XFA
   CPDFSDK_InterForm* m_pInterForm;
   FX_BOOL m_bAppModified;
   int32_t m_nAppAge;
   int32_t m_nValueAge;
+
 #ifdef PDF_ENABLE_XFA
-
   mutable IXFA_Widget* m_hMixXFAWidget;
   mutable IXFA_WidgetHandler* m_pWidgetHandler;
-#endif
+#endif  // PDF_ENABLE_XFA
 };
 
 #ifdef PDF_ENABLE_XFA
 class CPDFSDK_XFAWidget : public CPDFSDK_Annot {
  public:
   CPDFSDK_XFAWidget(IXFA_Widget* pAnnot,
                     CPDFSDK_PageView* pPageView,
                     CPDFSDK_InterForm* pInterForm);
   ~CPDFSDK_XFAWidget() override {}
 
   FX_BOOL IsXFAField() override;
   IXFA_Widget* GetXFAWidget() const override { return m_hXFAWidget; }
   CFX_ByteString GetType() const override;
   CFX_ByteString GetSubType() const override { return ""; }
   CFX_FloatRect GetRect() const override;
 
   CPDFSDK_InterForm* GetInterForm() { return m_pInterForm; }
 
  private:
   CPDFSDK_InterForm* m_pInterForm;
   IXFA_Widget* m_hXFAWidget;
 };
-
 #define CPDFSDK_XFAWidgetMap \
   CFX_MapPtrTemplate<IXFA_Widget*, CPDFSDK_XFAWidget*>
 #define CPDFSDK_FieldSynchronizeMap CFX_MapPtrTemplate<CPDF_FormField*, int>
+#endif  // PDF_ENABLE_XFA
 
-#endif
 class CPDFSDK_InterForm : public CPDF_FormNotify {
  public:
   explicit CPDFSDK_InterForm(CPDFSDK_Document* pDocument);
   ~CPDFSDK_InterForm() override;
 
   CPDF_InterForm* GetInterForm() const { return m_pInterForm; }
   CPDFSDK_Document* GetDocument() const { return m_pDocument; }
 
   FX_BOOL HighlightWidgets();
 
   CPDFSDK_Widget* GetSibling(CPDFSDK_Widget* pWidget, FX_BOOL bNext) const;
   CPDFSDK_Widget* GetWidget(CPDF_FormControl* pControl) const;
   void GetWidgets(const CFX_WideString& sFieldName,
                   std::vector<CPDFSDK_Widget*>* widgets) const;
   void GetWidgets(CPDF_FormField* pField,
                   std::vector<CPDFSDK_Widget*>* widgets) const;
 
   void AddMap(CPDF_FormControl* pControl, CPDFSDK_Widget* pWidget);
   void RemoveMap(CPDF_FormControl* pControl);
 
+  void EnableCalculate(FX_BOOL bEnabled);
+  FX_BOOL IsCalculateEnabled() const;
+
 #ifdef PDF_ENABLE_XFA
   void AddXFAMap(IXFA_Widget* hWidget, CPDFSDK_XFAWidget* pWidget);
   void RemoveXFAMap(IXFA_Widget* hWidget);
   CPDFSDK_XFAWidget* GetXFAWidget(IXFA_Widget* hWidget);
-
-#endif
-  void EnableCalculate(FX_BOOL bEnabled);
-  FX_BOOL IsCalculateEnabled() const;
-
-#ifdef PDF_ENABLE_XFA
   void XfaEnableCalculate(FX_BOOL bEnabled);
   FX_BOOL IsXfaCalculateEnabled() const;
-
   FX_BOOL IsXfaValidationsEnabled();
   void XfaSetValidationsEnabled(FX_BOOL bEnabled);
+#endif  // PDF_ENABLE_XFA
 
-#endif
 #ifdef _WIN32
   CPDF_Stream* LoadImageFromFile(const CFX_WideString& sFile);
 #endif
 
   void OnKeyStrokeCommit(CPDF_FormField* pFormField,
                          CFX_WideString& csValue,
                          FX_BOOL& bRC);
   void OnValidate(CPDF_FormField* pFormField,
                   CFX_WideString& csValue,
                   FX_BOOL& bRC);
@@ skipping 19 matching lines @@
                        FX_BOOL bUrlEncoded);
   FX_BOOL SubmitForm(const CFX_WideString& sDestination, FX_BOOL bUrlEncoded);
   FX_BOOL ExportFormToFDFTextBuf(CFX_ByteTextBuf& textBuf);
   FX_BOOL ExportFieldsToFDFTextBuf(const std::vector<CPDF_FormField*>& fields,
                                    FX_BOOL bIncludeOrExclude,
                                    CFX_ByteTextBuf& textBuf);
   CFX_WideString GetTemporaryFileName(const CFX_WideString& sFileExt);
 
 #ifdef PDF_ENABLE_XFA
   void SynchronizeField(CPDF_FormField* pFormField, FX_BOOL bSynchronizeElse);
+#endif  // PDF_ENABLE_XFA
 
-#endif
  private:
   // CPDF_FormNotify
   int BeforeValueChange(const CPDF_FormField* pField,
                         CFX_WideString& csValue) override;
   int AfterValueChange(const CPDF_FormField* pField) override;
   int BeforeSelectionChange(const CPDF_FormField* pField,
                             CFX_WideString& csValue) override;
   int AfterSelectionChange(const CPDF_FormField* pField) override;
   int AfterCheckedStatusChange(const CPDF_FormField* pField,
                                const CFX_ByteArray& statusArray) override;
   int BeforeFormReset(const CPDF_InterForm* pForm) override;
   int AfterFormReset(const CPDF_InterForm* pForm) override;
   int BeforeFormImportData(const CPDF_InterForm* pForm) override;
   int AfterFormImportData(const CPDF_InterForm* pForm) override;
 
   FX_BOOL FDFToURLEncodedData(CFX_WideString csFDFFile,
                               CFX_WideString csTxtFile);
   FX_BOOL FDFToURLEncodedData(uint8_t*& pBuf, FX_STRSIZE& nBufSize);
   int GetPageIndexByAnnotDict(CPDF_Document* pDocument,
                               CPDF_Dictionary* pAnnotDict) const;
 
   using CPDFSDK_WidgetMap = std::map<CPDF_FormControl*, CPDFSDK_Widget*>;
 
   CPDFSDK_Document* m_pDocument;
   CPDF_InterForm* m_pInterForm;
   CPDFSDK_WidgetMap m_Map;
 #ifdef PDF_ENABLE_XFA
   CPDFSDK_XFAWidgetMap m_XFAMap;
   CPDFSDK_FieldSynchronizeMap m_FieldSynchronizeMap;
-#endif
-  FX_BOOL m_bCalculate;
-#ifdef PDF_ENABLE_XFA
   FX_BOOL m_bXfaCalculate;
   FX_BOOL m_bXfaValidationsEnabled;
-#endif
+#endif  // PDF_ENABLE_XFA
+  FX_BOOL m_bCalculate;
   FX_BOOL m_bBusy;
 
  public:
   FX_BOOL IsNeedHighLight(int nFieldType);
   void RemoveAllHighLight();
   void SetHighlightAlpha(uint8_t alpha) { m_iHighlightAlpha = alpha; }
   uint8_t GetHighlightAlpha() { return m_iHighlightAlpha; }
   void SetHighlightColor(FX_COLORREF clr, int nFieldType);
   FX_COLORREF GetHighlightColor(int nFieldType);
 
  private:
 #ifndef PDF_ENABLE_XFA
   static const int kNumFieldTypes = 6;
-#else
+#else   // PDF_ENABLE_XFA
   static const int kNumFieldTypes = 7;
-#endif
+#endif  // PDF_ENABLE_XFA
+
   FX_COLORREF m_aHighlightColor[kNumFieldTypes];
   uint8_t m_iHighlightAlpha;
   FX_BOOL m_bNeedHightlight[kNumFieldTypes];
 };
 
 #define BAI_STRUCTURE 0
 #define BAI_ROW 1
 #define BAI_COLUMN 2
 
 #define CPDFSDK_Annots CFX_ArrayTemplate<CPDFSDK_Annot*>
@@ skipping 17 matching lines @@
   static CPDF_Rect GetAnnotRect(CPDFSDK_Annot* pAnnot);
 
   CPDFSDK_PageView* m_pPageView;
   CFX_ByteString m_sType;
   CFX_ByteString m_sSubType;
   int m_nTabs;
   CPDFSDK_Annots m_Annots;
 };
 
 #endif  // FPDFSDK_INCLUDE_FSDK_BASEFORM_H_