summaryrefslogtreecommitdiff
path: root/fpdfsdk/include/formfiller
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-05-28 13:23:12 -0700
committerTom Sepez <tsepez@chromium.org>2015-05-28 13:23:12 -0700
commit19922bbc0d62b81e0fdd6a01da39e9b875c53c68 (patch)
treea5976a2c761d4eb6478582f7a65640ca021343a9 /fpdfsdk/include/formfiller
parent18e5b4b41dc622d4601be538934272678beb7069 (diff)
downloadpdfium-19922bbc0d62b81e0fdd6a01da39e9b875c53c68.tar.xz
Merge to XFA: Fix ALL the include guards.
Original Review URL: https://codereview.chromium.org/1160443004 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1162013003
Diffstat (limited to 'fpdfsdk/include/formfiller')
-rw-r--r--fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h6
-rw-r--r--fpdfsdk/include/formfiller/FFL_CheckBox.h6
-rw-r--r--fpdfsdk/include/formfiller/FFL_ComboBox.h8
-rw-r--r--fpdfsdk/include/formfiller/FFL_FormFiller.h8
-rw-r--r--fpdfsdk/include/formfiller/FFL_IFormFiller.h7
-rw-r--r--fpdfsdk/include/formfiller/FFL_ListBox.h7
-rw-r--r--fpdfsdk/include/formfiller/FFL_Notify.h7
-rw-r--r--fpdfsdk/include/formfiller/FFL_PushButton.h7
-rw-r--r--fpdfsdk/include/formfiller/FFL_RadioButton.h7
-rw-r--r--fpdfsdk/include/formfiller/FFL_TextField.h6
-rw-r--r--fpdfsdk/include/formfiller/FFL_Utils.h6
-rw-r--r--fpdfsdk/include/formfiller/FormFiller.h6
12 files changed, 37 insertions, 44 deletions
diff --git a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h b/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
index 8601b98194..5e596657ec 100644
--- a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
+++ b/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _RAO_FONTMAP_H_
-#define _RAO_FONTMAP_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
#include "../pdfwindow/PWL_FontMap.h"
@@ -47,4 +47,4 @@ private:
CFX_ByteString m_sAPType;
};
-#endif // _RAO_FONTMAP_H_
+#endif // FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
diff --git a/fpdfsdk/include/formfiller/FFL_CheckBox.h b/fpdfsdk/include/formfiller/FFL_CheckBox.h
index 240e748ea3..bac1b9394b 100644
--- a/fpdfsdk/include/formfiller/FFL_CheckBox.h
+++ b/fpdfsdk/include/formfiller/FFL_CheckBox.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FFL_CHECKBOX_H_
-#define _FFL_CHECKBOX_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_
#include "FFL_FormFiller.h"
@@ -25,5 +25,5 @@ public:
virtual void SaveData(CPDFSDK_PageView* pPageView);
};
-#endif //_FFL_CHECKBOX_H_
+#endif // FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_
diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h
index df7ca55cc5..5f0aaa1440 100644
--- a/fpdfsdk/include/formfiller/FFL_ComboBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FFL_COMBOBOX_H_
-#define _FFL_COMBOBOX_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
#include "../../../core/include/fxcrt/fx_string.h"
#include "FFL_FormFiller.h"
@@ -69,8 +69,6 @@ private:
private:
CBA_FontMap* m_pFontMap;
FFL_ComboBoxState m_State;
- //CFFL_IM_BOX m_IMBox;
};
-#endif //_FFL_COMBOBOX_H_
-
+#endif // FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h
index 18426a91ba..08dd25b27f 100644
--- a/fpdfsdk/include/formfiller/FFL_FormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FFL_FORMFILLER_H_
-#define _FFL_FORMFILLER_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
#include "FFL_IFormFiller.h"
#include "FFL_CBA_Fontmap.h"
@@ -174,6 +174,4 @@ protected:
FX_BOOL m_bMouseDown;
};
-//#define CFFL_IM_BOX CFX_ArrayTemplate<CBA_EditInput*>
-
-#endif
+#endif // FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
index 1b33edd4e8..6e3e58139d 100644
--- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
@@ -4,10 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FFL_IFORMFILLER_H_
-#define _FFL_IFORMFILLER_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
#include "FormFiller.h"
+
class CFFL_FormFiller;
class CFFL_PrivateData;
@@ -146,5 +147,5 @@ public:
int nValueAge;
};
-#endif //_FFL_IFORMFILLER_H_
+#endif // FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
diff --git a/fpdfsdk/include/formfiller/FFL_ListBox.h b/fpdfsdk/include/formfiller/FFL_ListBox.h
index 03f71df5b9..b95ad725c2 100644
--- a/fpdfsdk/include/formfiller/FFL_ListBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ListBox.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FFL_LISTBOX_H_
-#define _FFL_LISTBOX_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_LISTBOX_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_LISTBOX_H_
#include "FFL_FormFiller.h"
@@ -43,5 +43,4 @@ private:
};
-#endif //_FFL_LISTBOX_H_
-
+#endif // FPDFSDK_INCLUDE_FORMFILLER_FFL_LISTBOX_H_
diff --git a/fpdfsdk/include/formfiller/FFL_Notify.h b/fpdfsdk/include/formfiller/FFL_Notify.h
index bd21ffc496..4e66c3a991 100644
--- a/fpdfsdk/include/formfiller/FFL_Notify.h
+++ b/fpdfsdk/include/formfiller/FFL_Notify.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FFL_NOTIFY_H_
-#define _FFL_NOTIFY_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_NOTIFY_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_NOTIFY_H_
#include "../../../core/include/fpdfdoc/fpdf_doc.h"
#include "../../../core/include/fxcrt/fx_string.h"
@@ -53,5 +53,4 @@ private:
FX_INT32 m_nNotifyFlag;
};
-#endif
-
+#endif // FPDFSDK_INCLUDE_FORMFILLER_FFL_NOTIFY_H_
diff --git a/fpdfsdk/include/formfiller/FFL_PushButton.h b/fpdfsdk/include/formfiller/FFL_PushButton.h
index 5d115c0771..4cf61a82d0 100644
--- a/fpdfsdk/include/formfiller/FFL_PushButton.h
+++ b/fpdfsdk/include/formfiller/FFL_PushButton.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FFL_PUSHBUTTON_H_
-#define _FFL_PUSHBUTTON_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_
#include "FFL_FormFiller.h"
@@ -23,5 +23,4 @@ public:
FX_DWORD dwFlags);
};
-#endif //_FFL_PUSHBUTTON_H_
-
+#endif // FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_
diff --git a/fpdfsdk/include/formfiller/FFL_RadioButton.h b/fpdfsdk/include/formfiller/FFL_RadioButton.h
index 2049a45345..8dba93307a 100644
--- a/fpdfsdk/include/formfiller/FFL_RadioButton.h
+++ b/fpdfsdk/include/formfiller/FFL_RadioButton.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FFL_RADIOBUTTON_H_
-#define _FFL_RADIOBUTTON_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_
#include "FFL_FormFiller.h"
@@ -23,5 +23,4 @@ public:
virtual void SaveData(CPDFSDK_PageView* pPageView);
};
-#endif //_FFL_RADIOBUTTON_H_
-
+#endif // FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_
diff --git a/fpdfsdk/include/formfiller/FFL_TextField.h b/fpdfsdk/include/formfiller/FFL_TextField.h
index 8351878522..fc7a2f8f34 100644
--- a/fpdfsdk/include/formfiller/FFL_TextField.h
+++ b/fpdfsdk/include/formfiller/FFL_TextField.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#if !defined(AFX_FFL_EDIT_H__8E0C9456_CBA2_4EFB_9F31_53C6D8C1A8AC__INCLUDED_)
-#define AFX_FFL_EDIT_H__8E0C9456_CBA2_4EFB_9F31_53C6D8C1A8AC__INCLUDED_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_
#include "FFL_FormFiller.h"
@@ -72,4 +72,4 @@ private:
};
-#endif // !defined(AFX_FFL_EDIT_H__8E0C9456_CBA2_4EFB_9F31_53C6D8C1A8AC__INCLUDED_)
+#endif // FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_
diff --git a/fpdfsdk/include/formfiller/FFL_Utils.h b/fpdfsdk/include/formfiller/FFL_Utils.h
index e64cce9ea4..ff06a347e8 100644
--- a/fpdfsdk/include/formfiller/FFL_Utils.h
+++ b/fpdfsdk/include/formfiller/FFL_Utils.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FFL_UTILS_H_
-#define _FFL_UTILS_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_UTILS_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_UTILS_H_
#include "../../../core/include/fpdfapi/fpdf_parser.h"
#include "../../../core/include/fxcrt/fx_memory.h"
@@ -21,4 +21,4 @@ public:
static FX_BOOL TraceObject(CPDF_Object* pObj);
};
-#endif // _FFL_UTILS_H_
+#endif // FPDFSDK_INCLUDE_FORMFILLER_FFL_UTILS_H_
diff --git a/fpdfsdk/include/formfiller/FormFiller.h b/fpdfsdk/include/formfiller/FormFiller.h
index d8df542179..fdca1ff940 100644
--- a/fpdfsdk/include/formfiller/FormFiller.h
+++ b/fpdfsdk/include/formfiller/FormFiller.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FORMFILLER_H_
-#define FORMFILLER_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
#include "../../../core/include/fpdfapi/fpdf_module.h"
#include "../../../core/include/fpdfdoc/fpdf_doc.h"
@@ -15,4 +15,4 @@
#include "../fxedit/fx_edit.h"
#include "../pdfwindow/IPDFWindow.h"
-#endif // FORMFILLER_H_
+#endif // FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_