From 880962cb81b7a34e4b90a2ecb1992f1afb13d529 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Tue, 23 Feb 2016 09:09:24 -0500
Subject: Sort includes in xfa/.

This CL sorts all the includes in the xfa/ directory. There are a lot of IWYU
errors that have been fixed to make things compile again.

BUG=pdfium:65
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1722803002 .
---
 xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp          | 2 +-
 xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h            | 4 ++--
 xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp            | 4 ++--
 xfa/src/fxbarcode/common/BC_CommonECI.cpp                      | 2 +-
 xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp       | 4 ++--
 xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h         | 4 +++-
 xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp         | 4 ++--
 xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp        | 2 +-
 xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp | 2 +-
 xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp   | 2 +-
 10 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'xfa/src/fxbarcode/common')

diff --git a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp
index af9b0bcb70..787324deee 100644
--- a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "xfa/src/fxbarcode/common/BC_CommonECI.h"
 #include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h"
+#include "xfa/src/fxbarcode/common/BC_CommonECI.h"
 void CBC_CommonCharacterSetECI::initialize() {}
 CBC_CommonCharacterSetECI::CBC_CommonCharacterSetECI(
     int32_t value,
diff --git a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h
index 9ca6548533..5575147fbe 100644
--- a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h
+++ b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h
@@ -7,8 +7,8 @@
 #ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_
 #define XFA_SRC_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_
 
-class CBC_CommonECI;
-class CBC_CommonCharacterSetECI;
+#include "xfa/src/fxbarcode/common/BC_CommonECI.h"
+
 class CBC_CommonCharacterSetECI : public CBC_CommonECI {
  public:
   CBC_CommonCharacterSetECI(int32_t value, CFX_ByteString encodingName);
diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
index 4210cb8513..9df2c31c21 100644
--- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
@@ -21,9 +21,9 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
-#include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h"
 #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
 CBC_CommonDecoderResult::CBC_CommonDecoderResult() {}
 void CBC_CommonDecoderResult::Init(const CFX_ByteArray& rawBytes,
                                    const CFX_ByteString& text,
diff --git a/xfa/src/fxbarcode/common/BC_CommonECI.cpp b/xfa/src/fxbarcode/common/BC_CommonECI.cpp
index efb9e94657..b6be150eb4 100644
--- a/xfa/src/fxbarcode/common/BC_CommonECI.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonECI.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "xfa/src/fxbarcode/common/BC_CommonECI.h"
 #include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h"
+#include "xfa/src/fxbarcode/common/BC_CommonECI.h"
 CBC_CommonECI::CBC_CommonECI(int32_t value) {
   m_value = value;
 }
diff --git a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp
index 9f0d99a99d..567b357545 100644
--- a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp
+++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "xfa/src/fxbarcode/barcode.h"
 #include "xfa/src/fxbarcode/BC_Binarizer.h"
 #include "xfa/src/fxbarcode/BC_LuminanceSource.h"
-#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
 const int32_t LUMINANCE_BITS = 5;
 const int32_t LUMINANCE_SHIFT = 8 - LUMINANCE_BITS;
diff --git a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h
index 86ac2eabe2..a74187e767 100644
--- a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h
+++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h
@@ -7,11 +7,13 @@
 #ifndef XFA_SRC_FXBARCODE_COMMON_BC_GLOBALHISTOGRAMBINARIZER_H_
 #define XFA_SRC_FXBARCODE_COMMON_BC_GLOBALHISTOGRAMBINARIZER_H_
 
+#include "core/include/fxcrt/fx_basic.h"
+
 class CBC_CommonBinarizer;
 class CBC_CommonBitArray;
 class CBC_CommonBitMatrix;
 class CBC_LuminanceSource;
-class CBC_GlobalHistogramBinarizer;
+
 class CBC_GlobalHistogramBinarizer : public CBC_Binarizer {
  public:
   CBC_GlobalHistogramBinarizer(CBC_LuminanceSource* source);
diff --git a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp
index a2d6c55067..13b852c1f7 100644
--- a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp
+++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
 #include "xfa/src/fxbarcode/barcode.h"
-#include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h"
 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/src/fxbarcode/BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h"
 const int32_t CBC_WhiteRectangleDetector::INIT_SIZE = 30;
 const int32_t CBC_WhiteRectangleDetector::CORR = 1;
 CBC_WhiteRectangleDetector::CBC_WhiteRectangleDetector(
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
index f74b5ff331..26bc9e4c7b 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
@@ -21,9 +21,9 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h"
 #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
 #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
-#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h"
 CBC_ReedSolomonEncoder::CBC_ReedSolomonEncoder(CBC_ReedSolomonGF256* field) {
   m_field = field;
 }
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp
index 5bb30912d4..22819c9342 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp
@@ -21,9 +21,9 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h"
 #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
 #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
-#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h"
 CBC_ReedSolomonDecoder::CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256* field) {
   m_field = field;
 }
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
index 6c7bbf7dea..2e059acf37 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
 #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
+#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
 CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::QRCodeFild = NULL;
 CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::DataMatrixField = NULL;
 void CBC_ReedSolomonGF256::Initialize() {
-- 
cgit v1.2.3