From 2cae3e26526a8aeef5744665589d1bfaf5efe6f3 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 26 Oct 2018 20:25:18 +0000 Subject: Forward declare a bunch of classes. Then do IWYU to fix up build errors. Move some implementations out of headers to allow more forward declarations. Change-Id: Idbeb978705a21cd6fb710ca9f5e99b4ea7d93ec5 Reviewed-on: https://pdfium-review.googlesource.com/c/44632 Reviewed-by: Tom Sepez Commit-Queue: Lei Zhang --- fxbarcode/BC_Writer.cpp | 2 ++ fxbarcode/BC_Writer.h | 3 ++- fxbarcode/cbc_codabar.h | 1 - fxbarcode/cbc_code128.h | 1 - fxbarcode/cbc_code39.h | 1 - fxbarcode/cbc_datamatrix.h | 1 - fxbarcode/cbc_ean13.h | 1 - fxbarcode/cbc_ean8.h | 1 - fxbarcode/cbc_pdf417i.h | 1 - fxbarcode/cbc_qrcode.h | 1 - fxbarcode/cbc_upca.h | 1 - fxbarcode/oned/BC_OneDimWriter.h | 2 +- 12 files changed, 5 insertions(+), 11 deletions(-) (limited to 'fxbarcode') diff --git a/fxbarcode/BC_Writer.cpp b/fxbarcode/BC_Writer.cpp index 711b82a5b4..5af796b5b0 100644 --- a/fxbarcode/BC_Writer.cpp +++ b/fxbarcode/BC_Writer.cpp @@ -6,6 +6,8 @@ #include "fxbarcode/BC_Writer.h" +#include "core/fxge/dib/cfx_dibitmap.h" + CBC_Writer::CBC_Writer() = default; CBC_Writer::~CBC_Writer() = default; diff --git a/fxbarcode/BC_Writer.h b/fxbarcode/BC_Writer.h index 7435807c8d..2a0ace6bd1 100644 --- a/fxbarcode/BC_Writer.h +++ b/fxbarcode/BC_Writer.h @@ -8,11 +8,12 @@ #define FXBARCODE_BC_WRITER_H_ #include "core/fxcrt/fx_string.h" -#include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/fx_dib.h" #include "fxbarcode/BC_Library.h" #include "fxbarcode/utils.h" +class CFX_DIBitmap; + class CBC_Writer { public: CBC_Writer(); diff --git a/fxbarcode/cbc_codabar.h b/fxbarcode/cbc_codabar.h index e8a62799c6..3e2bc6f7c4 100644 --- a/fxbarcode/cbc_codabar.h +++ b/fxbarcode/cbc_codabar.h @@ -9,7 +9,6 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/fx_dib.h" #include "fxbarcode/cbc_onecode.h" class CBC_OnedCodaBarWriter; diff --git a/fxbarcode/cbc_code128.h b/fxbarcode/cbc_code128.h index 16e30de9b9..606b36e000 100644 --- a/fxbarcode/cbc_code128.h +++ b/fxbarcode/cbc_code128.h @@ -9,7 +9,6 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/fx_dib.h" #include "fxbarcode/cbc_onecode.h" class CBC_OnedCode128Writer; diff --git a/fxbarcode/cbc_code39.h b/fxbarcode/cbc_code39.h index 26f0457334..d129fa408e 100644 --- a/fxbarcode/cbc_code39.h +++ b/fxbarcode/cbc_code39.h @@ -10,7 +10,6 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/fx_dib.h" #include "fxbarcode/cbc_onecode.h" class CBC_OnedCode39Writer; diff --git a/fxbarcode/cbc_datamatrix.h b/fxbarcode/cbc_datamatrix.h index b02da555c0..f28e76235f 100644 --- a/fxbarcode/cbc_datamatrix.h +++ b/fxbarcode/cbc_datamatrix.h @@ -9,7 +9,6 @@ #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/fx_dib.h" #include "fxbarcode/cbc_codebase.h" class CBC_DataMatrixWriter; diff --git a/fxbarcode/cbc_ean13.h b/fxbarcode/cbc_ean13.h index da0fd85b25..f5887c7b83 100644 --- a/fxbarcode/cbc_ean13.h +++ b/fxbarcode/cbc_ean13.h @@ -10,7 +10,6 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/fx_dib.h" #include "fxbarcode/cbc_onecode.h" class CBC_OnedEAN13Writer; diff --git a/fxbarcode/cbc_ean8.h b/fxbarcode/cbc_ean8.h index 53eed478b8..d0c7b21e11 100644 --- a/fxbarcode/cbc_ean8.h +++ b/fxbarcode/cbc_ean8.h @@ -9,7 +9,6 @@ #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/fx_dib.h" #include "fxbarcode/cbc_onecode.h" class CBC_OnedEAN8Writer; diff --git a/fxbarcode/cbc_pdf417i.h b/fxbarcode/cbc_pdf417i.h index 37dd5b4b0c..964901034f 100644 --- a/fxbarcode/cbc_pdf417i.h +++ b/fxbarcode/cbc_pdf417i.h @@ -9,7 +9,6 @@ #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/fx_dib.h" #include "fxbarcode/cbc_codebase.h" class CBC_PDF417Writer; diff --git a/fxbarcode/cbc_qrcode.h b/fxbarcode/cbc_qrcode.h index e40fbc80a0..428d61580f 100644 --- a/fxbarcode/cbc_qrcode.h +++ b/fxbarcode/cbc_qrcode.h @@ -9,7 +9,6 @@ #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/fx_dib.h" #include "fxbarcode/cbc_codebase.h" class CBC_QRCodeWriter; diff --git a/fxbarcode/cbc_upca.h b/fxbarcode/cbc_upca.h index de71581b96..89bfc52016 100644 --- a/fxbarcode/cbc_upca.h +++ b/fxbarcode/cbc_upca.h @@ -9,7 +9,6 @@ #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/fx_dib.h" #include "fxbarcode/cbc_onecode.h" class CBC_OnedUPCAWriter; diff --git a/fxbarcode/oned/BC_OneDimWriter.h b/fxbarcode/oned/BC_OneDimWriter.h index 404775b6e9..db801daf42 100644 --- a/fxbarcode/oned/BC_OneDimWriter.h +++ b/fxbarcode/oned/BC_OneDimWriter.h @@ -10,13 +10,13 @@ #include #include "core/fxcrt/unowned_ptr.h" -#include "core/fxge/cfx_renderdevice.h" #include "fxbarcode/BC_Library.h" #include "fxbarcode/BC_Writer.h" class CFX_Font; class CFX_PathData; class CFX_RenderDevice; +class FXTEXT_CHARPOS; class CBC_OneDimWriter : public CBC_Writer { public: -- cgit v1.2.3