14 files changed, 69 insertions, 42 deletions
diff --git a/xfa/src/fxbarcode/oned/BC_OneDReader.h b/xfa/src/fxbarcode/oned/BC_OneDReader.h
index 45585d44c5..17e0934287 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OneDReader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDREADER_H_
-#define _BC_ONEDREADER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDREADER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDREADER_H_
+
 class CBC_Reader;
 class CBC_BinaryBitmap;
 class CBC_CommonBitArray;
@@ -43,4 +44,5 @@ class CBC_OneDReader : public CBC_Reader {
                                const int32_t* pattern,
                                int32_t maxIndividualVariance);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDREADER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimReader.h b/xfa/src/fxbarcode/oned/BC_OneDimReader.h
index 0fb2c8690c..0a3e3c3d5d 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDUPCEANREADER_H_
-#define _BC_ONEDUPCEANREADER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDIMREADER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDIMREADER_H_
+
 class CBC_OneDReader;
 class CBC_CommonBitArray;
 class CBC_OneDimReader;
@@ -57,4 +58,5 @@ class CBC_OneDimReader : public CBC_OneDReader {
                                     int32_t endStart,
                                     int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDIMREADER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h
index 6218890a7f..e1cf9d8698 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDCODABARREADER_H_
-#define _BC_ONEDCODABARREADER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODABARREADER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODABARREADER_H_
+
 class CBC_CommonBitArray;
 class CBC_OneDReader;
 class CBC_OnedCodaBarReader;
@@ -28,4 +29,5 @@ class CBC_OnedCodaBarReader : public CBC_OneDReader {
 
   const static FX_CHAR STARTEND_ENCODING[8];
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODABARREADER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h
index 4530a140fb..3671821bce 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDCODABARWRITER_H_
-#define _BC_ONEDCODABARWRITER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
+
 enum BC_TEXT_LOC;
 class CBC_OneDimWriter;
 class CBC_OnedCodaBarWriter;
@@ -49,4 +50,5 @@ class CBC_OnedCodaBarWriter : public CBC_OneDimWriter {
   FX_CHAR m_chEnd;
   int32_t m_iWideNarrRatio;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h
index a8924828e4..592df3a02d 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDCODA128READER_H_
-#define _BC_ONEDCODA128READER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128READER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128READER_H_
+
 class CBC_OneDReader;
 class CBC_CommonBitArray;
 class CBC_OnedCoda128Reader;
@@ -43,4 +44,5 @@ class CBC_OnedCode128Reader : public CBC_OneDReader {
                      int32_t rowOffset,
                      int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128READER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h
index 94b0c9bc5a..b53cc95820 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDCODA128WRITER_H_
-#define _BC_ONEDCODA128WRITER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128WRITER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128WRITER_H_
+
 class CBC_OneDimWriter;
 class CBC_OnedCoda128Writer;
 class CBC_OnedCode128Writer : public CBC_OneDimWriter {
@@ -45,4 +46,5 @@ class CBC_OnedCode128Writer : public CBC_OneDimWriter {
   const static int32_t CODE_CODE_C;
   const static int32_t CODE_STOP;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA128WRITER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
index d450aa69bb..c1a70b8318 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDCODA39READER_H_
-#define _BC_ONEDCODA39READER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39READER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39READER_H_
+
 class CBC_OneDReader;
 class CBC_CommonBitArray;
 class CBC_OnedCoda39Reader;
@@ -32,4 +33,5 @@ class CBC_OnedCode39Reader : public CBC_OneDReader {
   FX_CHAR PatternToChar(int32_t pattern, int32_t& e);
   CFX_ByteString DecodeExtended(CFX_ByteString& encoded, int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39READER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
index e5a6c68754..1e422827d5 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDCODA39WRITER_H_
-#define _BC_ONEDCODA39WRITER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39WRITER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39WRITER_H_
+
 enum BC_TEXT_LOC;
 class CBC_OneDimWriter;
 class CBC_OnedCoda39Writer;
@@ -49,4 +50,5 @@ class CBC_OnedCode39Writer : public CBC_OneDimWriter {
   int32_t m_iWideNarrRatio;
   FX_BOOL m_extendedMode;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDCODA39WRITER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h
index 24b808eb6f..cf9e647c85 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDEAN13READER_H_
-#define _BC_ONEDEAN13READER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN13READER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN13READER_H_
 class CBC_OneDimReader;
 class CBC_CommonBitArray;
 class CBC_OnedEAN13Reader;
@@ -27,4 +27,5 @@ class CBC_OnedEAN13Reader : public CBC_OneDimReader {
                        int32_t& e);
   friend class CBC_OnedUPCAReader;
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN13READER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h
index ba755c900d..8fd42733f3 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDEAN13WRITER_H_
-#define _BC_ONEDEAN13WRITER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
+
 class CBC_OneDimWriter;
 class CBC_OnedEAN13Writer;
 class CBC_OnedEAN13Writer : public CBC_OneDimWriter {
@@ -48,4 +49,5 @@ class CBC_OnedEAN13Writer : public CBC_OneDimWriter {
                  int32_t multiple,
                  int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h
index 56a5e952fd..b9f14d6c85 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDEAN8READER_H_
-#define _BC_ONEDEAN8READER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN8READER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN8READER_H_
+
 class CBC_OneDimReader;
 class CBC_CommonBitArray;
 class CBC_OnedEAN8Reader;
@@ -20,4 +21,5 @@ class CBC_OnedEAN8Reader : public CBC_OneDimReader {
                        CFX_ByteString& result,
                        int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN8READER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h
index cca1f8470c..fd858fcc02 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDEAN8WRITER_H_
-#define _BC_ONEDEAN8WRITER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_
+
 enum BC_TEXT_LOC;
 class CBC_OneDimWriter;
 class CBC_OnedEAN8Writer;
@@ -50,4 +51,5 @@ class CBC_OnedEAN8Writer : public CBC_OneDimWriter {
                  int32_t multiple,
                  int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h
index a3feb52116..2b6bd1785a 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDUPCAREADER_H_
-#define _BC_ONEDUPCAREADER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDUPCAREADER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDUPCAREADER_H_
+
 class CBC_BinaryBitmap;
 class CBC_CommonBitArray;
 class CBC_OneDimReader;
@@ -38,4 +39,5 @@ class CBC_OnedUPCAReader : public CBC_OneDimReader {
                        int32_t& e);
   CFX_ByteString MaybeReturnResult(CFX_ByteString& result, int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDUPCAREADER_H_
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h
index 97b422d626..1b5ce48040 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _BC_ONEDUPCAWRITER_H_
-#define _BC_ONEDUPCAWRITER_H_
+#ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
+#define XFA_SRC_FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
+
 class CBC_Writer;
 class CBC_OnedEAN13Writer;
 class CBC_OnedUPCAWriter;
@@ -51,4 +52,5 @@ class CBC_OnedUPCAWriter : public CBC_OneDimWriter {
                  int32_t multiple,
                  int32_t& e);
 };
-#endif
+
+#endif  // XFA_SRC_FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_