From c909ce872d999a17ffd44afdc88caf2de43e6cba Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 8 Jan 2016 15:44:36 -0800 Subject: XFA: Remove many relative includes in xfa/ Also remove useless files. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1570743002 . --- BUILD.gn | 8 - xfa.gyp | 8 - xfa/include/foxitxfa.h | 20 +- xfa/include/fwl/adapter/fwl_adaptertimermgr.h | 4 +- xfa/include/fwl/fwl.h | 136 +++++------ xfa/include/fxfa/fxfa_basic.h | 2 +- xfa/include/fxfa/fxfa_objectacc.h | 2 +- xfa/include/fxjse/fxjse.h | 6 +- xfa/src/fdp/include/fde.h | 2 + xfa/src/fdp/include/fde_mem.h | 4 +- xfa/src/fdp/src/css/fde_csscache.cpp | 2 +- xfa/src/fdp/src/css/fde_cssdatatable.cpp | 10 +- xfa/src/fdp/src/css/fde_cssdatatable.h | 8 +- xfa/src/fdp/src/css/fde_cssdeclaration.cpp | 2 +- xfa/src/fdp/src/css/fde_cssstyleselector.cpp | 2 +- xfa/src/fdp/src/css/fde_cssstylesheet.cpp | 2 +- xfa/src/fdp/src/css/fde_csssyntax.cpp | 2 +- xfa/src/fdp/src/fde/fde_devbasic.cpp | 2 +- xfa/src/fdp/src/fde/fde_gedevice.cpp | 2 +- xfa/src/fdp/src/fde/fde_geobject.cpp | 2 +- xfa/src/fdp/src/fde/fde_geobject.h | 2 +- xfa/src/fdp/src/fde/fde_iterator.cpp | 2 +- xfa/src/fdp/src/fde/fde_object.cpp | 2 +- xfa/src/fdp/src/fde/fde_render.cpp | 2 +- xfa/src/fdp/src/tto/fde_textout.cpp | 2 +- xfa/src/fdp/src/xml/fde_xml.cpp | 2 +- xfa/src/fee/src/fee/fde_txtedtblock.cpp | 2 +- xfa/src/fee/src/fee/fde_txtedtbuf.cpp | 6 +- xfa/src/fee/src/fee/fde_txtedtengine.cpp | 9 +- xfa/src/fee/src/fee/fde_txtedtkmpmatch.cpp | 8 - xfa/src/fee/src/fee/fde_txtedtkmpmatch.h | 9 - xfa/src/fee/src/fee/fde_txtedtpage.cpp | 10 +- xfa/src/fee/src/fee/fde_txtedtparag.cpp | 8 +- xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp | 2 +- xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp | 2 +- xfa/src/fgas/include/fgas.h | 2 + xfa/src/fgas/include/fx_lbk.h | 8 + xfa/src/fgas/include/fx_mem.h | 2 +- xfa/src/fgas/include/fx_tbk.h | 2 +- xfa/src/fgas/include/fx_utl.h | 2 +- xfa/src/fgas/src/crt/fx_algorithm.cpp | 2 +- xfa/src/fgas/src/crt/fx_codepage.cpp | 3 +- xfa/src/fgas/src/crt/fx_codepage.h | 9 - xfa/src/fgas/src/crt/fx_cpmgr.cpp | 63 ----- xfa/src/fgas/src/crt/fx_encode.cpp | 3 +- xfa/src/fgas/src/crt/fx_memory.cpp | 2 +- xfa/src/fgas/src/crt/fx_stream.cpp | 2 +- xfa/src/fgas/src/crt/fx_system.cpp | 2 +- xfa/src/fgas/src/crt/fx_utils.cpp | 4 +- xfa/src/fgas/src/fgas_base.h | 8 +- xfa/src/fgas/src/font/fx_fontutils.cpp | 2 +- xfa/src/fgas/src/font/fx_gdifont.cpp | 2 +- xfa/src/fgas/src/font/fx_gefont.cpp | 2 +- xfa/src/fgas/src/font/fx_stdfontmgr.cpp | 2 +- xfa/src/fgas/src/layout/fx_linebreak.cpp | 5 +- xfa/src/fgas/src/layout/fx_rtfbreak.cpp | 9 +- xfa/src/fgas/src/layout/fx_rtfbreak.h | 2 +- xfa/src/fgas/src/layout/fx_textbreak.cpp | 9 +- xfa/src/fgas/src/layout/fx_textbreak.h | 2 +- xfa/src/fgas/src/layout/fx_unicode.cpp | 2 +- xfa/src/fgas/src/localization/fx_datetime.cpp | 2 +- xfa/src/fgas/src/localization/fx_locale.cpp | 4 +- xfa/src/fgas/src/localization/fx_localemgr.cpp | 4 +- xfa/src/fgas/src/xml/fx_sax_imp.cpp | 2 +- xfa/src/foxitlib.h | 14 +- xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp | 12 +- xfa/src/fwl/src/basewidget/fwl_caretimp.cpp | 10 +- xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp | 12 +- xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp | 28 +-- .../fwl/src/basewidget/fwl_datetimepickerimp.cpp | 22 +- xfa/src/fwl/src/basewidget/fwl_editimp.cpp | 22 +- xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp | 14 +- xfa/src/fwl/src/basewidget/fwl_listboximp.cpp | 14 +- .../fwl/src/basewidget/fwl_monthcalendarimp.cpp | 10 +- xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp | 10 +- xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp | 10 +- xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp | 10 +- xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp | 10 +- xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp | 14 +- xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp | 4 +- xfa/src/fwl/src/core/fwl_appimp.cpp | 12 +- xfa/src/fwl/src/core/fwl_contentimp.cpp | 14 +- xfa/src/fwl/src/core/fwl_formimp.cpp | 18 +- xfa/src/fwl/src/core/fwl_gridimp.cpp | 14 +- xfa/src/fwl/src/core/fwl_noteimp.cpp | 20 +- xfa/src/fwl/src/core/fwl_panelimp.cpp | 10 +- xfa/src/fwl/src/core/fwl_sdadapterimp.cpp | 10 +- xfa/src/fwl/src/core/fwl_targetimp.cpp | 4 +- xfa/src/fwl/src/core/fwl_threadimp.cpp | 10 +- xfa/src/fwl/src/core/fwl_timerimp.cpp | 8 +- xfa/src/fwl/src/core/fwl_widgetimp.cpp | 14 +- xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp | 14 +- xfa/src/fwl/src/lightwidget/app.cpp | 2 +- xfa/src/fwl/src/lightwidget/barcode.cpp | 2 +- xfa/src/fwl/src/lightwidget/caret.cpp | 2 +- xfa/src/fwl/src/lightwidget/checkbox.cpp | 2 +- xfa/src/fwl/src/lightwidget/combobox.cpp | 2 +- xfa/src/fwl/src/lightwidget/datetimepicker.cpp | 2 +- xfa/src/fwl/src/lightwidget/edit.cpp | 2 +- xfa/src/fwl/src/lightwidget/listbox.cpp | 2 +- xfa/src/fwl/src/lightwidget/picturebox.cpp | 2 +- xfa/src/fwl/src/lightwidget/pushbutton.cpp | 2 +- xfa/src/fwl/src/lightwidget/scrollbar.cpp | 2 +- xfa/src/fwl/src/lightwidget/theme.cpp | 2 +- xfa/src/fwl/src/lightwidget/tooltipctrl.cpp | 14 +- xfa/src/fwl/src/lightwidget/widget.cpp | 12 +- xfa/src/fwl/src/theme/barcodetp.cpp | 2 +- xfa/src/fwl/src/theme/carettp.cpp | 2 +- xfa/src/fwl/src/theme/checkboxtp.cpp | 2 +- xfa/src/fwl/src/theme/comboboxtp.cpp | 2 +- xfa/src/fwl/src/theme/datetimepickertp.cpp | 2 +- xfa/src/fwl/src/theme/edittp.cpp | 2 +- xfa/src/fwl/src/theme/formtp.cpp | 2 +- xfa/src/fwl/src/theme/listboxtp.cpp | 2 +- xfa/src/fwl/src/theme/monthcalendartp.cpp | 2 +- xfa/src/fwl/src/theme/pictureboxtp.cpp | 2 +- xfa/src/fwl/src/theme/pushbuttontp.cpp | 2 +- xfa/src/fwl/src/theme/scrollbartp.cpp | 2 +- xfa/src/fwl/src/theme/widgettp.cpp | 2 +- xfa/src/fxbarcode/BC_BarCode.cpp | 120 +++++----- xfa/src/fxbarcode/BC_Binarizer.cpp | 10 +- xfa/src/fxbarcode/BC_BinaryBitmap.cpp | 12 +- xfa/src/fxbarcode/BC_Dimension.cpp | 6 +- xfa/src/fxbarcode/BC_Library.cpp | 164 ++++++------- xfa/src/fxbarcode/BC_TwoDimWriter.cpp | 8 +- xfa/src/fxbarcode/barcode.h | 4 +- xfa/src/fxbarcode/common/BC_CommonBitArray.cpp | 2 +- xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp | 2 +- xfa/src/fxbarcode/common/BC_CommonBitSource.cpp | 2 +- xfa/src/fxbarcode/common/BC_CommonByteArray.cpp | 2 +- xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp | 2 +- .../fxbarcode/common/BC_CommonCharacterSetECI.cpp | 2 +- .../fxbarcode/common/BC_CommonDecoderResult.cpp | 6 +- xfa/src/fxbarcode/common/BC_CommonECI.cpp | 2 +- .../common/BC_CommonPerspectiveTransform.cpp | 2 +- .../common/BC_GlobalHistogramBinarizer.cpp | 6 +- .../fxbarcode/common/BC_WhiteRectangleDetector.cpp | 8 +- .../common/reedsolomon/BC_ReedSolomon.cpp | 2 +- .../common/reedsolomon/BC_ReedSolomonDecoder.cpp | 2 +- .../common/reedsolomon/BC_ReedSolomonGF256.cpp | 2 +- .../common/reedsolomon/BC_ReedSolomonGF256Poly.cpp | 2 +- xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp | 4 +- xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp | 4 +- xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp | 6 +- .../datamatrix/BC_DataMatrixBitMatrixParser.cpp | 4 +- .../datamatrix/BC_DataMatrixDataBlock.cpp | 2 +- .../BC_DataMatrixDecodedBitStreamParser.cpp | 6 +- .../fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp | 8 +- .../fxbarcode/datamatrix/BC_DataMatrixDetector.cpp | 14 +- .../fxbarcode/datamatrix/BC_DataMatrixReader.cpp | 10 +- .../datamatrix/BC_DataMatrixSymbolInfo144.cpp | 2 +- .../fxbarcode/datamatrix/BC_DataMatrixVersion.cpp | 2 +- .../fxbarcode/datamatrix/BC_DataMatrixWriter.cpp | 16 +- .../fxbarcode/datamatrix/BC_DefaultPlacement.cpp | 2 +- xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp | 6 +- xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp | 2 +- xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp | 8 +- .../fxbarcode/datamatrix/BC_ErrorCorrection.cpp | 2 +- .../fxbarcode/datamatrix/BC_HighLevelEncoder.cpp | 8 +- xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp | 6 +- .../fxbarcode/datamatrix/BC_SymbolShapeHint.cpp | 2 +- xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp | 6 +- xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp | 6 +- xfa/src/fxbarcode/oned/BC_OneDReader.cpp | 8 +- xfa/src/fxbarcode/oned/BC_OneDimReader.cpp | 6 +- xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp | 6 +- xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp | 12 +- xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp | 10 +- xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp | 6 +- xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp | 6 +- xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp | 6 +- xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp | 8 +- xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp | 6 +- xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp | 6 +- xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp | 6 +- xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp | 8 +- xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp | 4 +- xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp | 4 +- xfa/src/fxbarcode/pdf417/BC_PDF417.cpp | 2 +- .../fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp | 2 +- .../fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp | 2 +- xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp | 2 +- xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp | 2 +- xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp | 6 +- xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp | 2 +- .../fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp | 2 +- xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp | 2 +- xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp | 2 +- .../pdf417/BC_PDF417DecodedBitStreamParser.cpp | 6 +- .../fxbarcode/pdf417/BC_PDF417DetectionResult.cpp | 2 +- .../pdf417/BC_PDF417DetectionResultColumn.cpp | 2 +- .../BC_PDF417DetectionResultRowIndicatorColumn.cpp | 4 +- xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp | 10 +- .../fxbarcode/pdf417/BC_PDF417DetectorResult.cpp | 6 +- xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp | 2 +- .../pdf417/BC_PDF417ECErrorCorrection.cpp | 2 +- xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp | 2 +- .../fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp | 2 +- .../fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp | 2 +- .../fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp | 4 +- .../pdf417/BC_PDF417HighLevelEncoder_unittest.cpp | 4 +- xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp | 20 +- .../fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp | 2 +- .../fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp | 8 +- xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp | 8 +- xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp | 4 +- xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp | 4 +- .../qrcode/BC_QRAlignmentPatternFinder.cpp | 6 +- xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp | 4 +- xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp | 20 +- xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp | 8 +- xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp | 4 +- xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp | 4 +- xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp | 10 +- xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp | 12 +- .../qrcode/BC_QRCoderErrorCorrectionLevel.cpp | 2 +- .../qrcode/BC_QRCoderFormatInformation.cpp | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp | 4 +- xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp | 4 +- xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp | 6 +- xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp | 2 +- xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp | 4 +- .../qrcode/BC_QRDecodedBitStreamParser.cpp | 12 +- xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp | 6 +- xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp | 6 +- xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp | 4 +- .../fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp | 6 +- xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp | 6 +- xfa/src/fxfa/src/app/xfa_checksum.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffapp.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffbarcode.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffdoc.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffdoc.h | 2 +- xfa/src/fxfa/src/app/xfa_ffdochandler.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffdocview.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffdraw.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp | 4 +- xfa/src/fxfa/src/app/xfa_fffield.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffimage.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffimageedit.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffnotify.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffpageview.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffpath.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffsignature.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffsubform.cpp | 4 +- xfa/src/fxfa/src/app/xfa_fftext.cpp | 4 +- xfa/src/fxfa/src/app/xfa_fftextedit.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffwidget.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffwidget.h | 2 +- xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp | 4 +- xfa/src/fxfa/src/app/xfa_fontmgr.cpp | 4 +- xfa/src/fxfa/src/app/xfa_fwladapter.cpp | 4 +- xfa/src/fxfa/src/app/xfa_fwltheme.cpp | 4 +- xfa/src/fxfa/src/app/xfa_rendercontext.cpp | 4 +- xfa/src/fxfa/src/app/xfa_textlayout.cpp | 4 +- xfa/src/fxfa/src/common/xfa_common.h | 3 +- xfa/src/fxfa/src/common/xfa_debug.h | 9 - xfa/src/fxfa/src/fm2js/xfa_fm2js.cpp | 7 - xfa/src/fxfa/src/fm2js/xfa_fm2js.h | 21 +- xfa/src/fxfa/src/parser/xfa_basic_data.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_basic_imp.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_debug_parser.cpp | 18 -- xfa/src/fxfa/src/parser/xfa_debug_parser.h | 9 - .../parser/xfa_document_datadescription_imp.cpp | 22 +- .../src/parser/xfa_document_datamerger_imp.cpp | 23 +- xfa/src/fxfa/src/parser/xfa_document_imp.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_document_imp.h | 9 - .../fxfa/src/parser/xfa_document_layout_imp.cpp | 23 +- xfa/src/fxfa/src/parser/xfa_document_serialize.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_locale.cpp | 24 +- xfa/src/fxfa/src/parser/xfa_localemgr.cpp | 24 +- xfa/src/fxfa/src/parser/xfa_localevalue.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_object_imp.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_parser_imp.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp | 22 +- .../src/parser/xfa_script_eventpseudomodel.cpp | 22 +- .../fxfa/src/parser/xfa_script_hostpseudomodel.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_script_imp.cpp | 22 +- .../src/parser/xfa_script_layoutpseudomodel.cpp | 22 +- .../fxfa/src/parser/xfa_script_logpseudomodel.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp | 22 +- .../src/parser/xfa_script_resolveprocessor.cpp | 22 +- .../src/parser/xfa_script_signaturepseudomodel.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_utils_imp.cpp | 22 +- xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp | 6 +- xfa/src/fxgraphics/src/fx_metafile_interpreter.cpp | 257 --------------------- xfa/src/fxgraphics/src/fx_metafile_interpreter.h | 53 ----- xfa/src/fxgraphics/src/fx_path_generator.h | 2 +- xfa/src/fxgraphics/src/pre.h | 2 +- xfa/src/fxjse/src/class.cpp | 2 +- xfa/src/fxjse/src/context.cpp | 2 +- xfa/src/fxjse/src/dynprop.cpp | 2 +- xfa/src/fxjse/src/runtime.cpp | 4 +- xfa/src/fxjse/src/value.cpp | 2 +- 308 files changed, 1178 insertions(+), 1685 deletions(-) delete mode 100644 xfa/src/fee/src/fee/fde_txtedtkmpmatch.cpp delete mode 100644 xfa/src/fee/src/fee/fde_txtedtkmpmatch.h delete mode 100644 xfa/src/fgas/src/crt/fx_codepage.h delete mode 100644 xfa/src/fgas/src/crt/fx_cpmgr.cpp delete mode 100644 xfa/src/fxfa/src/common/xfa_debug.h delete mode 100644 xfa/src/fxfa/src/fm2js/xfa_fm2js.cpp delete mode 100644 xfa/src/fxfa/src/parser/xfa_debug_parser.cpp delete mode 100644 xfa/src/fxfa/src/parser/xfa_debug_parser.h delete mode 100644 xfa/src/fxfa/src/parser/xfa_document_imp.h delete mode 100644 xfa/src/fxgraphics/src/fx_metafile_interpreter.cpp delete mode 100644 xfa/src/fxgraphics/src/fx_metafile_interpreter.h diff --git a/BUILD.gn b/BUILD.gn index d881d00c49..487b604840 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -899,8 +899,6 @@ if (pdf_enable_xfa) { "xfa/src/fee/src/fee/fde_txtedtbuf.h", "xfa/src/fee/src/fee/fde_txtedtengine.cpp", "xfa/src/fee/src/fee/fde_txtedtengine.h", - "xfa/src/fee/src/fee/fde_txtedtkmpmatch.cpp", - "xfa/src/fee/src/fee/fde_txtedtkmpmatch.h", "xfa/src/fee/src/fee/fde_txtedtpage.cpp", "xfa/src/fee/src/fee/fde_txtedtpage.h", "xfa/src/fee/src/fee/fde_txtedtparag.cpp", @@ -926,7 +924,6 @@ if (pdf_enable_xfa) { "xfa/src/fgas/include/fx_utl.h", "xfa/src/fgas/src/crt/fx_algorithm.cpp", "xfa/src/fgas/src/crt/fx_codepage.cpp", - "xfa/src/fgas/src/crt/fx_codepage.h", "xfa/src/fgas/src/crt/fx_encode.cpp", "xfa/src/fgas/src/crt/fx_memory.cpp", "xfa/src/fgas/src/crt/fx_memory.h", @@ -1336,7 +1333,6 @@ if (pdf_enable_xfa) { "xfa/src/fxfa/src/app/xfa_textlayout.h", "xfa/src/fxfa/src/common/fxfa_localevalue.h", "xfa/src/fxfa/src/common/xfa_common.h", - "xfa/src/fxfa/src/common/xfa_debug.h", "xfa/src/fxfa/src/common/xfa_docdata.h", "xfa/src/fxfa/src/common/xfa_doclayout.h", "xfa/src/fxfa/src/common/xfa_document.h", @@ -1350,7 +1346,6 @@ if (pdf_enable_xfa) { "xfa/src/fxfa/src/fm2js/xfa_error.h", "xfa/src/fxfa/src/fm2js/xfa_expression.cpp", "xfa/src/fxfa/src/fm2js/xfa_expression.h", - "xfa/src/fxfa/src/fm2js/xfa_fm2js.cpp", "xfa/src/fxfa/src/fm2js/xfa_fm2js.h", "xfa/src/fxfa/src/fm2js/xfa_fm2jsapi.cpp", "xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp", @@ -1366,14 +1361,11 @@ if (pdf_enable_xfa) { "xfa/src/fxfa/src/parser/xfa_basic_data.cpp", "xfa/src/fxfa/src/parser/xfa_basic_imp.cpp", "xfa/src/fxfa/src/parser/xfa_basic_imp.h", - "xfa/src/fxfa/src/parser/xfa_debug_parser.cpp", - "xfa/src/fxfa/src/parser/xfa_debug_parser.h", "xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp", "xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h", "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp", "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h", "xfa/src/fxfa/src/parser/xfa_document_imp.cpp", - "xfa/src/fxfa/src/parser/xfa_document_imp.h", "xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp", "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h", "xfa/src/fxfa/src/parser/xfa_document_serialize.cpp", diff --git a/xfa.gyp b/xfa.gyp index 41497f72e6..810464e7ee 100644 --- a/xfa.gyp +++ b/xfa.gyp @@ -146,8 +146,6 @@ "xfa/src/fee/src/fee/fde_txtedtbuf.h", "xfa/src/fee/src/fee/fde_txtedtengine.cpp", "xfa/src/fee/src/fee/fde_txtedtengine.h", - "xfa/src/fee/src/fee/fde_txtedtkmpmatch.cpp", - "xfa/src/fee/src/fee/fde_txtedtkmpmatch.h", "xfa/src/fee/src/fee/fde_txtedtpage.cpp", "xfa/src/fee/src/fee/fde_txtedtpage.h", "xfa/src/fee/src/fee/fde_txtedtparag.cpp", @@ -173,7 +171,6 @@ "xfa/src/fgas/include/fx_utl.h", "xfa/src/fgas/src/crt/fx_algorithm.cpp", "xfa/src/fgas/src/crt/fx_codepage.cpp", - "xfa/src/fgas/src/crt/fx_codepage.h", "xfa/src/fgas/src/crt/fx_encode.cpp", "xfa/src/fgas/src/crt/fx_memory.cpp", "xfa/src/fgas/src/crt/fx_memory.h", @@ -583,7 +580,6 @@ "xfa/src/fxfa/src/app/xfa_textlayout.h", "xfa/src/fxfa/src/common/fxfa_localevalue.h", "xfa/src/fxfa/src/common/xfa_common.h", - "xfa/src/fxfa/src/common/xfa_debug.h", "xfa/src/fxfa/src/common/xfa_docdata.h", "xfa/src/fxfa/src/common/xfa_doclayout.h", "xfa/src/fxfa/src/common/xfa_document.h", @@ -597,7 +593,6 @@ "xfa/src/fxfa/src/fm2js/xfa_error.h", "xfa/src/fxfa/src/fm2js/xfa_expression.cpp", "xfa/src/fxfa/src/fm2js/xfa_expression.h", - "xfa/src/fxfa/src/fm2js/xfa_fm2js.cpp", "xfa/src/fxfa/src/fm2js/xfa_fm2js.h", "xfa/src/fxfa/src/fm2js/xfa_fm2jsapi.cpp", "xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp", @@ -613,14 +608,11 @@ "xfa/src/fxfa/src/parser/xfa_basic_data.cpp", "xfa/src/fxfa/src/parser/xfa_basic_imp.cpp", "xfa/src/fxfa/src/parser/xfa_basic_imp.h", - "xfa/src/fxfa/src/parser/xfa_debug_parser.cpp", - "xfa/src/fxfa/src/parser/xfa_debug_parser.h", "xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp", "xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h", "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp", "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h", "xfa/src/fxfa/src/parser/xfa_document_imp.cpp", - "xfa/src/fxfa/src/parser/xfa_document_imp.h", "xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp", "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h", "xfa/src/fxfa/src/parser/xfa_document_serialize.cpp", diff --git a/xfa/include/foxitxfa.h b/xfa/include/foxitxfa.h index 3df47326b7..c5730b7069 100644 --- a/xfa/include/foxitxfa.h +++ b/xfa/include/foxitxfa.h @@ -8,14 +8,14 @@ #ifndef _FOXIT_XFA_H_ #define _FOXIT_XFA_H_ -#include "../../core/include/fxcrt/fx_ext.h" -#include "../../core/include/fxge/fx_ge.h" -#include "../../core/include/fxcodec/fx_codec.h" -#include "../../core/include/fdrm/fx_crypt.h" -#include "../../core/include/fpdfdoc/fpdf_doc.h" -#include "./fxbarcode/BC_BarCode.h" -#include "./fxgraphics/fx_graphics.h" -#include "./fwl/fwl.h" -#include "./fxjse/fxjse.h" -#include "./fxfa/fxfa.h" +#include "core/include/fxcrt/fx_ext.h" +#include "core/include/fxge/fx_ge.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fdrm/fx_crypt.h" +#include "core/include/fpdfdoc/fpdf_doc.h" +#include "xfa/include/fxbarcode/BC_BarCode.h" +#include "xfa/include/fxgraphics/fx_graphics.h" +#include "xfa/include/fwl/fwl.h" +#include "xfa/include/fxjse/fxjse.h" +#include "xfa/include/fxfa/fxfa.h" #endif diff --git a/xfa/include/fwl/adapter/fwl_adaptertimermgr.h b/xfa/include/fwl/adapter/fwl_adaptertimermgr.h index 3c862aabf8..aed9241397 100644 --- a/xfa/include/fwl/adapter/fwl_adaptertimermgr.h +++ b/xfa/include/fwl/adapter/fwl_adaptertimermgr.h @@ -7,8 +7,8 @@ #ifndef _FWL_ADAPTER_TIMERMGR_H #define _FWL_ADAPTER_TIMERMGR_H -#include "../core/fwl_error.h" -#include "../core/fwl_timer.h" +#include "xfa/include/fwl/core/fwl_error.h" +#include "xfa/include/fwl/core/fwl_timer.h" class IFWL_Timer; diff --git a/xfa/include/fwl/fwl.h b/xfa/include/fwl/fwl.h index a8363a192b..8b99cc116f 100644 --- a/xfa/include/fwl/fwl.h +++ b/xfa/include/fwl/fwl.h @@ -4,73 +4,75 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +// TODO(thestig): Remove this file and do IWYU. + #ifndef _FWL_H #define _FWL_H -#include "core/fwl_error.h" -#include "core/fwl_target.h" -#include "core/fwl_thread.h" -#include "core/fwl_note.h" -#include "core/fwl_widgetdef.h" -#include "core/fwl_theme.h" -#include "core/fwl_widget.h" -#include "core/fwl_content.h" -#include "core/fwl_panel.h" -#include "core/fwl_form.h" -#include "core/fwl_widgetmgr.h" -#include "core/fwl_timer.h" -#include "core/fwl_app.h" -#include "core/fwl_grid.h" -#include "basewidget/fwl_pushbutton.h" -#include "basewidget/fwl_checkbox.h" -#include "basewidget/fwl_scrollbar.h" -#include "basewidget/fwl_listbox.h" -#include "basewidget/fwl_edit.h" -#include "basewidget/fwl_picturebox.h" -#include "basewidget/fwl_combobox.h" -#include "basewidget/fwl_menu.h" -#include "basewidget/fwl_monthcalendar.h" -#include "basewidget/fwl_datetimepicker.h" -#include "basewidget/fwl_spinbutton.h" -#include "basewidget/fwl_barcode.h" -#include "basewidget/fxmath_barcode.h" -#include "basewidget/fwl_tooltipctrl.h" -#include "basewidget/fwl_caret.h" -#include "lightwidget/app.h" -#include "lightwidget/widget.h" -#include "lightwidget/pushbutton.h" -#include "lightwidget/checkbox.h" -#include "lightwidget/scrollbar.h" -#include "lightwidget/listbox.h" -#include "lightwidget/picturebox.h" -#include "lightwidget/edit.h" -#include "lightwidget/combobox.h" -#include "lightwidget/datetimepicker.h" -#include "lightwidget/barcode.h" -#include "lightwidget/theme.h" -#include "lightwidget/tooltipctrl.h" -#include "lightwidget/caret.h" -#include "theme/utils.h" -#include "theme/widgettp.h" -#include "theme/barcodetp.h" -#include "theme/checkboxtp.h" -#include "theme/comboboxtp.h" -#include "theme/datetimepickertp.h" -#include "theme/edittp.h" -#include "theme/formtp.h" -#include "theme/listboxtp.h" -#include "theme/monthcalendartp.h" -#include "theme/pictureboxtp.h" -#include "theme/pushbuttontp.h" -#include "theme/scrollbartp.h" -#include "theme/widgettp.h" -#include "theme/barcodetp.h" -#include "theme/carettp.h" -#include "adapter/fwl_adapternative.h" -#include "adapter/fwl_adapterthreadmgr.h" -#include "adapter/fwl_adaptertimermgr.h" -#include "adapter/fwl_adapterwidgetmgr.h" -#include "adapter/fwl_adaptercursormgr.h" -#include "adapter/fwl_adaptermonitormgr.h" -#include "adapter/fwl_adapterclipboardmgr.h" -#include "adapter/fwl_sdadapterimp.h" +#include "xfa/include/fwl/core/fwl_error.h" +#include "xfa/include/fwl/core/fwl_target.h" +#include "xfa/include/fwl/core/fwl_thread.h" +#include "xfa/include/fwl/core/fwl_note.h" +#include "xfa/include/fwl/core/fwl_widgetdef.h" +#include "xfa/include/fwl/core/fwl_theme.h" +#include "xfa/include/fwl/core/fwl_widget.h" +#include "xfa/include/fwl/core/fwl_content.h" +#include "xfa/include/fwl/core/fwl_panel.h" +#include "xfa/include/fwl/core/fwl_form.h" +#include "xfa/include/fwl/core/fwl_widgetmgr.h" +#include "xfa/include/fwl/core/fwl_timer.h" +#include "xfa/include/fwl/core/fwl_app.h" +#include "xfa/include/fwl/core/fwl_grid.h" +#include "xfa/include/fwl/basewidget/fwl_pushbutton.h" +#include "xfa/include/fwl/basewidget/fwl_checkbox.h" +#include "xfa/include/fwl/basewidget/fwl_scrollbar.h" +#include "xfa/include/fwl/basewidget/fwl_listbox.h" +#include "xfa/include/fwl/basewidget/fwl_edit.h" +#include "xfa/include/fwl/basewidget/fwl_picturebox.h" +#include "xfa/include/fwl/basewidget/fwl_combobox.h" +#include "xfa/include/fwl/basewidget/fwl_menu.h" +#include "xfa/include/fwl/basewidget/fwl_monthcalendar.h" +#include "xfa/include/fwl/basewidget/fwl_datetimepicker.h" +#include "xfa/include/fwl/basewidget/fwl_spinbutton.h" +#include "xfa/include/fwl/basewidget/fwl_barcode.h" +#include "xfa/include/fwl/basewidget/fxmath_barcode.h" +#include "xfa/include/fwl/basewidget/fwl_tooltipctrl.h" +#include "xfa/include/fwl/basewidget/fwl_caret.h" +#include "xfa/include/fwl/lightwidget/app.h" +#include "xfa/include/fwl/lightwidget/widget.h" +#include "xfa/include/fwl/lightwidget/pushbutton.h" +#include "xfa/include/fwl/lightwidget/checkbox.h" +#include "xfa/include/fwl/lightwidget/scrollbar.h" +#include "xfa/include/fwl/lightwidget/listbox.h" +#include "xfa/include/fwl/lightwidget/picturebox.h" +#include "xfa/include/fwl/lightwidget/edit.h" +#include "xfa/include/fwl/lightwidget/combobox.h" +#include "xfa/include/fwl/lightwidget/datetimepicker.h" +#include "xfa/include/fwl/lightwidget/barcode.h" +#include "xfa/include/fwl/lightwidget/theme.h" +#include "xfa/include/fwl/lightwidget/tooltipctrl.h" +#include "xfa/include/fwl/lightwidget/caret.h" +#include "xfa/include/fwl/theme/utils.h" +#include "xfa/include/fwl/theme/widgettp.h" +#include "xfa/include/fwl/theme/barcodetp.h" +#include "xfa/include/fwl/theme/checkboxtp.h" +#include "xfa/include/fwl/theme/comboboxtp.h" +#include "xfa/include/fwl/theme/datetimepickertp.h" +#include "xfa/include/fwl/theme/edittp.h" +#include "xfa/include/fwl/theme/formtp.h" +#include "xfa/include/fwl/theme/listboxtp.h" +#include "xfa/include/fwl/theme/monthcalendartp.h" +#include "xfa/include/fwl/theme/pictureboxtp.h" +#include "xfa/include/fwl/theme/pushbuttontp.h" +#include "xfa/include/fwl/theme/scrollbartp.h" +#include "xfa/include/fwl/theme/widgettp.h" +#include "xfa/include/fwl/theme/barcodetp.h" +#include "xfa/include/fwl/theme/carettp.h" +#include "xfa/include/fwl/adapter/fwl_adapternative.h" +#include "xfa/include/fwl/adapter/fwl_adapterthreadmgr.h" +#include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h" +#include "xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h" +#include "xfa/include/fwl/adapter/fwl_adaptercursormgr.h" +#include "xfa/include/fwl/adapter/fwl_adaptermonitormgr.h" +#include "xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h" +#include "xfa/include/fwl/adapter/fwl_sdadapterimp.h" #endif diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/include/fxfa/fxfa_basic.h index 7d90fe82ef..e71e417734 100644 --- a/xfa/include/fxfa/fxfa_basic.h +++ b/xfa/include/fxfa/fxfa_basic.h @@ -7,7 +7,7 @@ #ifndef _FXFA_BASIC_H #define _FXFA_BASIC_H -#include "../fxjse/fxjse.h" +#include "xfa/include/fxjse/fxjse.h" class CXFA_Measurement; #define XFA_HASHCODE_Xfa 0xc56b9ff diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h index 3cef82b363..897cb08f99 100644 --- a/xfa/include/fxfa/fxfa_objectacc.h +++ b/xfa/include/fxfa/fxfa_objectacc.h @@ -7,7 +7,7 @@ #ifndef FXFA_OBJECTACC_H_ #define FXFA_OBJECTACC_H_ -#include "../../../core/include/fxge/fx_dib.h" // For FX_ARGB. +#include "core/include/fxge/fx_dib.h" // For FX_ARGB. class CXFA_Node; class IFX_Locale; diff --git a/xfa/include/fxjse/fxjse.h b/xfa/include/fxjse/fxjse.h index 572d697394..5aa563a1eb 100644 --- a/xfa/include/fxjse/fxjse.h +++ b/xfa/include/fxjse/fxjse.h @@ -7,9 +7,9 @@ #ifndef XFA_INCLUDE_FXJSE_FXJSE_H_ #define XFA_INCLUDE_FXJSE_FXJSE_H_ -#include "../../../core/include/fpdfapi/fpdf_parser.h" -#include "../../../core/include/fxcrt/fx_string.h" -#include "../../../core/include/fxcrt/fx_system.h" +#include "core/include/fpdfapi/fpdf_parser.h" +#include "core/include/fxcrt/fx_string.h" +#include "core/include/fxcrt/fx_system.h" class CPDFDoc_Environment; class CPDF_Page; diff --git a/xfa/src/fdp/include/fde.h b/xfa/src/fdp/include/fde.h index 1e2c311188..bb3eae203e 100644 --- a/xfa/src/fdp/include/fde.h +++ b/xfa/src/fdp/include/fde.h @@ -4,6 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +// TODO(thestig): Remove this file and do IWYU. + #ifndef _FDE #define _FDE #include "fde_mem.h" diff --git a/xfa/src/fdp/include/fde_mem.h b/xfa/src/fdp/include/fde_mem.h index c05ab8e85b..9ecf037683 100644 --- a/xfa/src/fdp/include/fde_mem.h +++ b/xfa/src/fdp/include/fde_mem.h @@ -4,10 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +// TODO(thestig): Remove this file and do IWYU. + #ifndef FDE_MEM_H_ #define FDE_MEM_H_ -#include "../../../../core/include/fxcrt/fx_memory.h" +#include "core/include/fxcrt/fx_memory.h" #define FDE_NewWith FXTARGET_NewWith #define FDE_DeleteWith FXTARGET_DeleteWith diff --git a/xfa/src/fdp/src/css/fde_csscache.cpp b/xfa/src/fdp/src/css/fde_csscache.cpp index b04758649f..fd33019e18 100644 --- a/xfa/src/fdp/src/css/fde_csscache.cpp +++ b/xfa/src/fdp/src/css/fde_csscache.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_csscache.h" _FDE_CSSCACHEITEM::_FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p) : pStylesheet(p), dwActivity(0) { diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.cpp b/xfa/src/fdp/src/css/fde_cssdatatable.cpp index fc74aba1c5..fa64122fca 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.cpp +++ b/xfa/src/fdp/src/css/fde_cssdatatable.cpp @@ -4,11 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_cssdatatable.h" -#ifdef _cplusplus -extern "C" { -#endif + FX_BOOL FDE_CSSLengthToFloat(const FDE_CSSLENGTH& len, FX_FLOAT fPercentBase, FX_FLOAT& fResult) { @@ -776,9 +774,7 @@ FX_BOOL FDE_ParseCSSColor(const FX_WCHAR* pszValue, } return FALSE; } -#ifdef _cplusplus -}; -#endif + CFDE_CSSValueList::CFDE_CSSValueList(IFX_MEMAllocator* pStaticStore, const CFDE_CSSValueArray& list) { m_iCount = list.GetSize(); diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.h b/xfa/src/fdp/src/css/fde_cssdatatable.h index 53dfe8769f..4d75d556a2 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.h +++ b/xfa/src/fdp/src/css/fde_cssdatatable.h @@ -115,9 +115,7 @@ class CFDE_CSSValueListParser : public CFX_Target { const FX_WCHAR* m_pCur; const FX_WCHAR* m_pEnd; }; -#ifdef _cplusplus -extern "C" { -#endif + #define FDE_CSSVALUETYPE_MaybeNumber 0x0100 #define FDE_CSSVALUETYPE_MaybeEnum 0x0200 #define FDE_CSSVALUETYPE_MaybeURI 0x0400 @@ -193,7 +191,5 @@ FX_BOOL FDE_ParseCSSURI(const FX_WCHAR* pszValue, int32_t iValueLen, int32_t& iOffset, int32_t& iLength); -#ifdef _cplusplus -}; -#endif + #endif diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp index c81b2cb373..d78d94ed5c 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_cssdeclaration.h" IFDE_CSSValue* CFDE_CSSDeclaration::GetProperty(FDE_CSSPROPERTY eProperty, FX_BOOL& bImportant) const { diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp index 6600449aa5..8a832b413a 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_csscache.h" #include "fde_cssdeclaration.h" #include "fde_cssstyleselector.h" diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp index 0ba1751b9f..4e9567fa33 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_csssyntax.h" #include "fde_cssdatatable.h" #include "fde_cssstylesheet.h" diff --git a/xfa/src/fdp/src/css/fde_csssyntax.cpp b/xfa/src/fdp/src/css/fde_csssyntax.cpp index 7d540bb623..2cd3d12b64 100644 --- a/xfa/src/fdp/src/css/fde_csssyntax.cpp +++ b/xfa/src/fdp/src/css/fde_csssyntax.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_csssyntax.h" #include "fde_cssdatatable.h" #ifdef _cplusplus diff --git a/xfa/src/fdp/src/fde/fde_devbasic.cpp b/xfa/src/fdp/src/fde/fde_devbasic.cpp index 78a0fa6d68..30030f826c 100644 --- a/xfa/src/fdp/src/fde/fde_devbasic.cpp +++ b/xfa/src/fdp/src/fde/fde_devbasic.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_devbasic.h" static const FDE_HATCHDATA gs_HatchBitmapData[FDE_HATCHSTYLE_Total] = { {16, diff --git a/xfa/src/fdp/src/fde/fde_gedevice.cpp b/xfa/src/fdp/src/fde/fde_gedevice.cpp index 8eb325ee02..08f05e74bb 100644 --- a/xfa/src/fdp/src/fde/fde_gedevice.cpp +++ b/xfa/src/fdp/src/fde/fde_gedevice.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_gedevice.h" #include "fde_geobject.h" #include "fde_devbasic.h" diff --git a/xfa/src/fdp/src/fde/fde_geobject.cpp b/xfa/src/fdp/src/fde/fde_geobject.cpp index 01ecd1ece7..53770810fc 100644 --- a/xfa/src/fdp/src/fde/fde_geobject.cpp +++ b/xfa/src/fdp/src/fde/fde_geobject.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_object.h" #include "fde_geobject.h" #ifndef _FDEPLUS diff --git a/xfa/src/fdp/src/fde/fde_geobject.h b/xfa/src/fdp/src/fde/fde_geobject.h index eb465a1ad6..d09831b8aa 100644 --- a/xfa/src/fdp/src/fde/fde_geobject.h +++ b/xfa/src/fdp/src/fde/fde_geobject.h @@ -7,7 +7,7 @@ #ifndef _FDE_GRAPHOBJS_IMP #define _FDE_GRAPHOBJS_IMP #ifndef _FDEPLUS -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" class CFDE_GEFontMgr; class CFDE_Path : public IFDE_Path, public CFX_Target { public: diff --git a/xfa/src/fdp/src/fde/fde_iterator.cpp b/xfa/src/fdp/src/fde/fde_iterator.cpp index daf3d0be02..75bca9ee8c 100644 --- a/xfa/src/fdp/src/fde/fde_iterator.cpp +++ b/xfa/src/fdp/src/fde/fde_iterator.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_iterator.h" IFDE_VisualSetIterator* IFDE_VisualSetIterator::Create() { return new CFDE_VisualSetIterator; diff --git a/xfa/src/fdp/src/fde/fde_object.cpp b/xfa/src/fdp/src/fde/fde_object.cpp index 3ae84a7df7..5eeb94135e 100644 --- a/xfa/src/fdp/src/fde/fde_object.cpp +++ b/xfa/src/fdp/src/fde/fde_object.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_object.h" IFDE_Pen* IFDE_Pen::Create() { return new CFDE_Pen(); diff --git a/xfa/src/fdp/src/fde/fde_render.cpp b/xfa/src/fdp/src/fde/fde_render.cpp index f47c9fef76..1d6351bf20 100644 --- a/xfa/src/fdp/src/fde/fde_render.cpp +++ b/xfa/src/fdp/src/fde/fde_render.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_render.h" void FDE_GetPageMatrix(CFX_Matrix& pageMatrix, const CFX_RectF& docPageRect, diff --git a/xfa/src/fdp/src/tto/fde_textout.cpp b/xfa/src/fdp/src/tto/fde_textout.cpp index 9781c7f943..b9a8e80107 100644 --- a/xfa/src/fdp/src/tto/fde_textout.cpp +++ b/xfa/src/fdp/src/tto/fde_textout.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_textout.h" IFDE_TextOut* IFDE_TextOut::Create() { return new CFDE_TextOut; diff --git a/xfa/src/fdp/src/xml/fde_xml.cpp b/xfa/src/fdp/src/xml/fde_xml.cpp index 00a3bf24eb..aa217227c4 100644 --- a/xfa/src/fdp/src/xml/fde_xml.cpp +++ b/xfa/src/fdp/src/xml/fde_xml.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_xml.h" #ifdef __cplusplus extern "C" { diff --git a/xfa/src/fee/src/fee/fde_txtedtblock.cpp b/xfa/src/fee/src/fee/fde_txtedtblock.cpp index d98b6eefa4..15ef6620cc 100644 --- a/xfa/src/fee/src/fee/fde_txtedtblock.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtblock.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fde_txtedtblock.h" #ifdef FDE_USEFORMATBLOCK #define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9 diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp index 53aef2ba03..0019207212 100644 --- a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../../include/ifde_txtedtbuf.h" -#include "../../include/ifde_txtedtengine.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fee/include/ifde_txtedtbuf.h" +#include "xfa/src/fee/include/ifde_txtedtengine.h" #include "fde_txtedtbuf.h" #define FDE_DEFCHUNKCOUNT 2 #define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9 diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/src/fee/fde_txtedtengine.cpp index 6cf8f0e872..51f41d1273 100644 --- a/xfa/src/fee/src/fee/fde_txtedtengine.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtengine.cpp @@ -4,13 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../../include/ifde_txtedtengine.h" -#include "../../include/ifde_txtedtbuf.h" -#include "../../include/ifde_txtedtpage.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fee/include/ifde_txtedtengine.h" +#include "xfa/src/fee/include/ifde_txtedtbuf.h" +#include "xfa/src/fee/include/ifde_txtedtpage.h" #include "fde_txtedtengine.h" #include "fde_txtedtparag.h" -#include "fde_txtedtkmpmatch.h" #include "fde_txtedtbuf.h" #ifdef FDE_USEFORMATBLOCK #include "fde_txtedtblock.h" diff --git a/xfa/src/fee/src/fee/fde_txtedtkmpmatch.cpp b/xfa/src/fee/src/fee/fde_txtedtkmpmatch.cpp deleted file mode 100644 index 7d0790bf8c..0000000000 --- a/xfa/src/fee/src/fee/fde_txtedtkmpmatch.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// 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 - -#include "../../../foxitlib.h" -#include "fde_txtedtkmpmatch.h" diff --git a/xfa/src/fee/src/fee/fde_txtedtkmpmatch.h b/xfa/src/fee/src/fee/fde_txtedtkmpmatch.h deleted file mode 100644 index 0b5b477172..0000000000 --- a/xfa/src/fee/src/fee/fde_txtedtkmpmatch.h +++ /dev/null @@ -1,9 +0,0 @@ -// 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 _FDE_KMPMATCH_H -#define _FDE_KMPMATCH_H -#endif diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.cpp b/xfa/src/fee/src/fee/fde_txtedtpage.cpp index ec715b9070..2c592232f6 100644 --- a/xfa/src/fee/src/fee/fde_txtedtpage.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtpage.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../../include/ifde_txtedtbuf.h" -#include "../../include/ifde_txtedtengine.h" -#include "../../include/ifde_txtedtpage.h" -#include "../../include/fx_wordbreak.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fee/include/ifde_txtedtbuf.h" +#include "xfa/src/fee/include/ifde_txtedtengine.h" +#include "xfa/src/fee/include/ifde_txtedtpage.h" +#include "xfa/src/fee/include/fx_wordbreak.h" #include "fde_txtedtpage.h" #include "fde_txtedtengine.h" #include "fde_txtedtparag.h" diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.cpp b/xfa/src/fee/src/fee/fde_txtedtparag.cpp index cf6fa77acc..7be3a27e24 100644 --- a/xfa/src/fee/src/fee/fde_txtedtparag.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtparag.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../../include/ifde_txtedtbuf.h" -#include "../../include/ifde_txtedtengine.h" -#include "../../include/fx_wordbreak.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fee/include/ifde_txtedtbuf.h" +#include "xfa/src/fee/include/ifde_txtedtengine.h" +#include "xfa/src/fee/include/fx_wordbreak.h" #include "fde_txtedtparag.h" #include "fde_txtedtengine.h" #include "fde_txtedtbuf.h" diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp index e3d1fc2cf0..1841523d9b 100644 --- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp +++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fx_wordbreak_impl.h" #define FX_IsOdd(a) ((a)&1) FX_WordBreakProp FX_GetWordBreakProperty(FX_WCHAR wcCodePoint) { diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp index 8cf2c2a290..2527a79ba8 100644 --- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp +++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fx_wordbreak_impl.h" extern const FX_WORD gs_FX_WordBreak_Table[16] = { 0xFFFF, 0xFFF9, 0xFFFB, 0xFFFB, 0xFFFB, 0xFFFB, 0xEFBB, 0xE77B, diff --git a/xfa/src/fgas/include/fgas.h b/xfa/src/fgas/include/fgas.h index 8f085e4791..dc155a0818 100644 --- a/xfa/src/fgas/include/fgas.h +++ b/xfa/src/fgas/include/fgas.h @@ -4,6 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +// TODO(thestig): Remove this file and do IWYU. + #ifndef _FGAS_ #define _FGAS_ #include "fx_sys.h" diff --git a/xfa/src/fgas/include/fx_lbk.h b/xfa/src/fgas/include/fx_lbk.h index 0ddf57ecdc..a7421eb66b 100644 --- a/xfa/src/fgas/include/fx_lbk.h +++ b/xfa/src/fgas/include/fx_lbk.h @@ -6,6 +6,10 @@ #ifndef _FX_LINEBREAK #define _FX_LINEBREAK + +#include "core/include/fxcrt/fx_system.h" +#include "xfa/src/fgas/include/fx_utl.h" + enum FX_LINEBREAKTYPE { FX_LBT_UNKNOWN = 0x00, FX_LBT_DIRECT_BRK = 0x1A, @@ -15,6 +19,7 @@ enum FX_LINEBREAKTYPE { FX_LBT_PROHIBITED_BRK = 0x5E, FX_LBT_HANGUL_SPACE_BRK = 0x6F, }; + #define FX_LBUN FX_LBT_UNKNOWN #define FX_LBDB FX_LBT_DIRECT_BRK #define FX_LBIB FX_LBT_INDIRECT_BRK @@ -22,6 +27,9 @@ enum FX_LINEBREAKTYPE { #define FX_LBCP FX_LBT_COM_PROHIBITED_BRK #define FX_LBPB FX_LBT_PROHIBITED_BRK #define FX_LBHS FX_LBT_HANGUL_SPACE_BRK + +extern const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32]; + void FX_GetLineBreakPositions(const FX_WCHAR* pwsText, FX_LINEBREAKTYPE* pBrkType, int32_t iLength); diff --git a/xfa/src/fgas/include/fx_mem.h b/xfa/src/fgas/include/fx_mem.h index 313fc935cc..5e65ea7c88 100644 --- a/xfa/src/fgas/include/fx_mem.h +++ b/xfa/src/fgas/include/fx_mem.h @@ -7,7 +7,7 @@ #ifndef _FX_MEMORY #define _FX_MEMORY -#include "../../../../core/include/fxcrt/fx_memory.h" // For FX_Alloc(). +#include "core/include/fxcrt/fx_memory.h" // For FX_Alloc(). class IFX_MEMAllocator; class CFX_Target; diff --git a/xfa/src/fgas/include/fx_tbk.h b/xfa/src/fgas/include/fx_tbk.h index 7cc1db2252..349fc166a0 100644 --- a/xfa/src/fgas/include/fx_tbk.h +++ b/xfa/src/fgas/include/fx_tbk.h @@ -7,7 +7,7 @@ #ifndef _FX_TEXTBREAK #define _FX_TEXTBREAK -#include "../../../../core/include/fxcrt/fx_ucd.h" +#include "core/include/fxcrt/fx_ucd.h" class IFX_Font; class CFX_Char; diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h index 3c4024f772..c58d5a1be6 100644 --- a/xfa/src/fgas/include/fx_utl.h +++ b/xfa/src/fgas/include/fx_utl.h @@ -8,7 +8,7 @@ #define _FX_UTILS #include "fx_mem.h" -#include "../../../../core/include/fxcrt/fx_coordinates.h" // For CFX_Rect. +#include "core/include/fxcrt/fx_coordinates.h" // For CFX_Rect. class CFX_ThreadLock; class CFX_BaseArray; diff --git a/xfa/src/fgas/src/crt/fx_algorithm.cpp b/xfa/src/fgas/src/crt/fx_algorithm.cpp index eb58cdc8ae..dc848458cf 100644 --- a/xfa/src/fgas/src/crt/fx_algorithm.cpp +++ b/xfa/src/fgas/src/crt/fx_algorithm.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" +#include "xfa/src/fgas/src/fgas_base.h" #ifdef __cplusplus extern "C" { #endif diff --git a/xfa/src/fgas/src/crt/fx_codepage.cpp b/xfa/src/fgas/src/crt/fx_codepage.cpp index 7154b9ce8d..9348d33065 100644 --- a/xfa/src/fgas/src/crt/fx_codepage.cpp +++ b/xfa/src/fgas/src/crt/fx_codepage.cpp @@ -4,8 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" -#include "fx_codepage.h" +#include "xfa/src/fgas/src/fgas_base.h" static const FX_CHARSET_MAP g_FXCharset2CodePageTable[] = { {0, 1252}, {1, 0}, {2, 42}, {77, 10000}, {78, 10001}, {79, 10003}, {80, 10008}, {81, 10002}, {83, 10005}, {84, 10004}, diff --git a/xfa/src/fgas/src/crt/fx_codepage.h b/xfa/src/fgas/src/crt/fx_codepage.h deleted file mode 100644 index 031f4642cb..0000000000 --- a/xfa/src/fgas/src/crt/fx_codepage.h +++ /dev/null @@ -1,9 +0,0 @@ -// 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 _FX_CODEPAGE_IMP -#define _FX_CODEPAGE_IMP -#endif diff --git a/xfa/src/fgas/src/crt/fx_cpmgr.cpp b/xfa/src/fgas/src/crt/fx_cpmgr.cpp deleted file mode 100644 index 4803513180..0000000000 --- a/xfa/src/fgas/src/crt/fx_cpmgr.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// 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 - -#include "../fgas_base.h" -#include "fx_codepage.h" -#ifdef _FXCP -#ifdef __cplusplus -extern "C" { -#endif -extern const FX_CODEPAGE_HEADER g_CP936_MapHeader; -extern const FX_CODEPAGE_HEADER g_CP932_MapHeader; -extern const FX_CODEPAGE_HEADER g_CP949_MapHeader; -extern const FX_CODEPAGE_HEADER g_CP950_MapHeader; -extern const FX_CODEPAGE_HEADER g_CP874_MapHeader; -extern const FX_CODEPAGE_HEADER g_CP1250_MapHeader; -extern const FX_CODEPAGE_HEADER g_CP1251_MapHeader; -extern const FX_CODEPAGE_HEADER g_CP1252_MapHeader; -extern const FX_CODEPAGE_HEADER g_CP1253_MapHeader; -extern const FX_CODEPAGE_HEADER g_CP1254_MapHeader; -extern const FX_CODEPAGE_HEADER g_CP1255_MapHeader; -extern const FX_CODEPAGE_HEADER g_CP1256_MapHeader; -extern const FX_CODEPAGE_HEADER g_CP1257_MapHeader; -extern const FX_CODEPAGE_HEADER g_CP1258_MapHeader; -extern const FX_CPCU_MAPINFO g_CP936_CUMap; -extern const FX_CPCU_MAPINFO g_CP932_CUMap; -extern const FX_CPCU_MAPINFO g_CP949_CUMap; -extern const FX_CPCU_MAPINFO g_CP950_CUMap; -extern const FX_CPCU_MAPINFO g_CP874_CUMap; -extern const FX_CPCU_MAPINFO g_CP1250_CUMap; -extern const FX_CPCU_MAPINFO g_CP1251_CUMap; -extern const FX_CPCU_MAPINFO g_CP1252_CUMap; -extern const FX_CPCU_MAPINFO g_CP1253_CUMap; -extern const FX_CPCU_MAPINFO g_CP1254_CUMap; -extern const FX_CPCU_MAPINFO g_CP1255_CUMap; -extern const FX_CPCU_MAPINFO g_CP1256_CUMap; -extern const FX_CPCU_MAPINFO g_CP1257_CUMap; -extern const FX_CPCU_MAPINFO g_CP1258_CUMap; -FX_LPCCODEPAGE FX_GetCodePage(FX_WORD wCodePage) { - int32_t iEnd = sizeof(g_FXCodePageMgr) / sizeof(FX_CODEPAGE) - 1; - FXSYS_assert(iEnd >= 0); - int32_t iStart = 0, iMid; - uint16_t uCPID; - do { - iMid = (iStart + iEnd) / 2; - const FX_CODEPAGE& cp = g_FXCodePageMgr[iMid]; - uCPID = cp.pCPHeader->uCPID; - if (wCodePage == uCPID) { - return g_FXCodePageMgr + iMid; - } else if (wCodePage < uCPID) { - iEnd = iMid - 1; - } else { - iStart = iMid + 1; - } - } while (iStart <= iEnd); - return NULL; -} -#ifdef __cplusplus -} -#endif -#endif diff --git a/xfa/src/fgas/src/crt/fx_encode.cpp b/xfa/src/fgas/src/crt/fx_encode.cpp index f563961a9a..f2c5acb1c1 100644 --- a/xfa/src/fgas/src/crt/fx_encode.cpp +++ b/xfa/src/fgas/src/crt/fx_encode.cpp @@ -4,8 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" -#include "fx_codepage.h" +#include "xfa/src/fgas/src/fgas_base.h" void FX_SwapByteOrder(FX_WCHAR* pStr, int32_t iLength) { FXSYS_assert(pStr != NULL); if (iLength < 0) { diff --git a/xfa/src/fgas/src/crt/fx_memory.cpp b/xfa/src/fgas/src/crt/fx_memory.cpp index ae387b2ee0..a450119caf 100644 --- a/xfa/src/fgas/src/crt/fx_memory.cpp +++ b/xfa/src/fgas/src/crt/fx_memory.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" +#include "xfa/src/fgas/src/fgas_base.h" #include "fx_memory.h" #define FX_4BYTEALIGN(size) (((size) + 3) / 4 * 4) IFX_MEMAllocator* FX_CreateAllocator(FX_ALLOCTYPE eType, diff --git a/xfa/src/fgas/src/crt/fx_stream.cpp b/xfa/src/fgas/src/crt/fx_stream.cpp index 57bf13fa29..9bb59782c2 100644 --- a/xfa/src/fgas/src/crt/fx_stream.cpp +++ b/xfa/src/fgas/src/crt/fx_stream.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" +#include "xfa/src/fgas/src/fgas_base.h" #include "fx_stream.h" IFX_Stream* IFX_Stream::CreateStream(IFX_BufferRead* pBufferRead, FX_DWORD dwAccess, diff --git a/xfa/src/fgas/src/crt/fx_system.cpp b/xfa/src/fgas/src/crt/fx_system.cpp index c965ab2b54..0de8e0eb5b 100644 --- a/xfa/src/fgas/src/crt/fx_system.cpp +++ b/xfa/src/fgas/src/crt/fx_system.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" +#include "xfa/src/fgas/src/fgas_base.h" #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \ _FX_OS_ == _FX_WIN64_ #include diff --git a/xfa/src/fgas/src/crt/fx_utils.cpp b/xfa/src/fgas/src/crt/fx_utils.cpp index 4d27e5bf19..9d89e240f4 100644 --- a/xfa/src/fgas/src/crt/fx_utils.cpp +++ b/xfa/src/fgas/src/crt/fx_utils.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fx_utl.h" -#include "../fgas_base.h" +#include "xfa/src/fgas/include/fx_utl.h" +#include "xfa/src/fgas/src/fgas_base.h" #include "fx_utils.h" CFX_ThreadLock::CFX_ThreadLock() { diff --git a/xfa/src/fgas/src/fgas_base.h b/xfa/src/fgas/src/fgas_base.h index d860ec3c9b..eea3b6cac4 100644 --- a/xfa/src/fgas/src/fgas_base.h +++ b/xfa/src/fgas/src/fgas_base.h @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +// TODO(thestig): Remove this file and do IWYU. + #ifndef _FXMATH_BASE_ #define _FXMATH_BASE_ -#include "../../foxitlib.h" -#include "../../../../core/include/fxge/fx_freetype.h" -#include "../include/fgas.h" +#include "xfa/src/foxitlib.h" +#include "core/include/fxge/fx_freetype.h" +#include "xfa/src/fgas/include/fgas.h" #endif diff --git a/xfa/src/fgas/src/font/fx_fontutils.cpp b/xfa/src/fgas/src/font/fx_fontutils.cpp index 53532f7e4a..a57e059f72 100644 --- a/xfa/src/fgas/src/font/fx_fontutils.cpp +++ b/xfa/src/fgas/src/font/fx_fontutils.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" +#include "xfa/src/fgas/src/fgas_base.h" #include "fx_fontutils.h" FX_DWORD FGAS_GetFontHashCode(FX_WORD wCodePage, FX_DWORD dwFontStyles) { FX_DWORD dwHash = wCodePage; diff --git a/xfa/src/fgas/src/font/fx_gdifont.cpp b/xfa/src/fgas/src/font/fx_gdifont.cpp index 6840c5bddf..aa923b6a21 100644 --- a/xfa/src/fgas/src/font/fx_gdifont.cpp +++ b/xfa/src/fgas/src/font/fx_gdifont.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" +#include "xfa/src/fgas/src/fgas_base.h" #include "fx_gdifont.h" #include "fx_stdfontmgr.h" #ifdef _FXPLUS diff --git a/xfa/src/fgas/src/font/fx_gefont.cpp b/xfa/src/fgas/src/font/fx_gefont.cpp index e3f04796de..f76444f68f 100644 --- a/xfa/src/fgas/src/font/fx_gefont.cpp +++ b/xfa/src/fgas/src/font/fx_gefont.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" +#include "xfa/src/fgas/src/fgas_base.h" #include "fx_gefont.h" #include "fx_fontutils.h" #ifndef _FXPLUS diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp index 807213394b..6201022323 100644 --- a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp +++ b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" +#include "xfa/src/fgas/src/fgas_base.h" #include "fx_stdfontmgr.h" #include "fx_fontutils.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ diff --git a/xfa/src/fgas/src/layout/fx_linebreak.cpp b/xfa/src/fgas/src/layout/fx_linebreak.cpp index 76fc222195..2757904250 100644 --- a/xfa/src/fgas/src/layout/fx_linebreak.cpp +++ b/xfa/src/fgas/src/layout/fx_linebreak.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" +#include "xfa/src/fgas/src/fgas_base.h" -extern const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32] = { +const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32] = { {FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBCP, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, @@ -264,6 +264,7 @@ extern const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32] = { FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN}, }; + void FX_GetLineBreakPositions(const FX_WCHAR* pwsText, FX_LINEBREAKTYPE* pBrkType, int32_t iLength) { diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp index 15fa5c3b53..8683bcfdb6 100644 --- a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp +++ b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp @@ -4,10 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" -#include "fx_unicode.h" -#include "fx_rtfbreak.h" -extern const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32]; +#include "xfa/src/fgas/include/fx_lbk.h" +#include "xfa/src/fgas/src/fgas_base.h" +#include "xfa/src/fgas/src/layout/fx_unicode.h" +#include "xfa/src/fgas/src/layout/fx_rtfbreak.h" + IFX_RTFBreak* IFX_RTFBreak::Create(FX_DWORD dwPolicies) { return new CFX_RTFBreak(dwPolicies); } diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.h b/xfa/src/fgas/src/layout/fx_rtfbreak.h index 3d1a029e1e..e54e3dbbe2 100644 --- a/xfa/src/fgas/src/layout/fx_rtfbreak.h +++ b/xfa/src/fgas/src/layout/fx_rtfbreak.h @@ -7,7 +7,7 @@ #ifndef _FX_RTFBREAK_IMP #define _FX_RTFBREAK_IMP -#include "../../../../../core/include/fxcrt/fx_arb.h" +#include "core/include/fxcrt/fx_arb.h" class CFX_RTFLine; class CFX_RTFBreak; diff --git a/xfa/src/fgas/src/layout/fx_textbreak.cpp b/xfa/src/fgas/src/layout/fx_textbreak.cpp index 461ac03d47..754e10d863 100644 --- a/xfa/src/fgas/src/layout/fx_textbreak.cpp +++ b/xfa/src/fgas/src/layout/fx_textbreak.cpp @@ -4,10 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../../core/include/fxcrt/fx_arb.h" -#include "../fgas_base.h" -#include "fx_unicode.h" -#include "fx_textbreak.h" +#include "core/include/fxcrt/fx_arb.h" +#include "xfa/src/fgas/include/fx_lbk.h" +#include "xfa/src/fgas/src/fgas_base.h" +#include "xfa/src/fgas/src/layout/fx_unicode.h" +#include "xfa/src/fgas/src/layout/fx_textbreak.h" extern const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32]; IFX_TxtBreak* IFX_TxtBreak::Create(FX_DWORD dwPolicies) { diff --git a/xfa/src/fgas/src/layout/fx_textbreak.h b/xfa/src/fgas/src/layout/fx_textbreak.h index 7c8d0d39e2..68deed58d6 100644 --- a/xfa/src/fgas/src/layout/fx_textbreak.h +++ b/xfa/src/fgas/src/layout/fx_textbreak.h @@ -7,7 +7,7 @@ #ifndef _FX_TEXTBREAK_IMP #define _FX_TEXTBREAK_IMP -#include "../../../../../core/include/fxcrt/fx_memory.h" +#include "core/include/fxcrt/fx_memory.h" class IFX_ArabicChar; class CFX_Txtbreak; diff --git a/xfa/src/fgas/src/layout/fx_unicode.cpp b/xfa/src/fgas/src/layout/fx_unicode.cpp index 09beb44063..ff98760826 100644 --- a/xfa/src/fgas/src/layout/fx_unicode.cpp +++ b/xfa/src/fgas/src/layout/fx_unicode.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" +#include "xfa/src/fgas/src/fgas_base.h" #include "fx_unicode.h" void FX_TEXTLAYOUT_PieceSort(CFX_TPOArray& tpos, int32_t iStart, int32_t iEnd) { FXSYS_assert(iStart > -1 && iStart < tpos.GetSize()); diff --git a/xfa/src/fgas/src/localization/fx_datetime.cpp b/xfa/src/fgas/src/localization/fx_datetime.cpp index 646bdd6929..e8dc8dcbc0 100644 --- a/xfa/src/fgas/src/localization/fx_datetime.cpp +++ b/xfa/src/fgas/src/localization/fx_datetime.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" +#include "xfa/src/fgas/src/fgas_base.h" const uint8_t g_FXDaysPerMonth[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; const uint8_t g_FXDaysPerLeapMonth[12] = {31, 29, 31, 30, 31, 30, diff --git a/xfa/src/fgas/src/localization/fx_locale.cpp b/xfa/src/fgas/src/localization/fx_locale.cpp index c97156999a..d9424c39fc 100644 --- a/xfa/src/fgas/src/localization/fx_locale.cpp +++ b/xfa/src/fgas/src/localization/fx_locale.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../../core/include/fxcrt/fx_xml.h" -#include "../fgas_base.h" +#include "core/include/fxcrt/fx_xml.h" +#include "xfa/src/fgas/src/fgas_base.h" #include "fx_localeimp.h" #define FX_LOCALECATEGORY_DateHash 0xbde9abde diff --git a/xfa/src/fgas/src/localization/fx_localemgr.cpp b/xfa/src/fgas/src/localization/fx_localemgr.cpp index d236630d6b..cea681bf56 100644 --- a/xfa/src/fgas/src/localization/fx_localemgr.cpp +++ b/xfa/src/fgas/src/localization/fx_localemgr.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../../core/include/fxcrt/fx_xml.h" -#include "../fgas_base.h" +#include "core/include/fxcrt/fx_xml.h" +#include "xfa/src/fgas/src/fgas_base.h" #include "fx_localemgr.h" IFX_LocaleMgr* FX_LocaleMgr_Create(const FX_WCHAR* pszLocalPath, diff --git a/xfa/src/fgas/src/xml/fx_sax_imp.cpp b/xfa/src/fgas/src/xml/fx_sax_imp.cpp index 6ffa206f35..dce96470a6 100644 --- a/xfa/src/fgas/src/xml/fx_sax_imp.cpp +++ b/xfa/src/fgas/src/xml/fx_sax_imp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../fgas_base.h" +#include "xfa/src/fgas/src/fgas_base.h" #include "fx_sax_imp.h" IFX_SAXReader* FX_SAXReader_Create() { return new CFX_SAXReader; diff --git a/xfa/src/foxitlib.h b/xfa/src/foxitlib.h index eaa62abf6b..3496b1cd16 100644 --- a/xfa/src/foxitlib.h +++ b/xfa/src/foxitlib.h @@ -4,12 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +// TODO(thestig): Remove this file and do IWYU. + #ifndef _FOXIT_LIB_H_ #define _FOXIT_LIB_H_ -#include "../include/foxitxfa.h" -#include "./fgas/include/fgas.h" -#include "./fdp/include/fde.h" -#include "./fee/include/ifde_txtedtengine.h" -#include "./fee/include/ifde_txtedtpage.h" -#include "./fee/include/fx_wordbreak.h" +#include "xfa/include/foxitxfa.h" +#include "xfa/src/fgas/include/fgas.h" +#include "xfa/src/fdp/include/fde.h" +#include "xfa/src/fee/include/ifde_txtedtengine.h" +#include "xfa/src/fee/include/ifde_txtedtpage.h" +#include "xfa/src/fee/include/fx_wordbreak.h" #endif diff --git a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp index 02cd6a7b54..1961a938b0 100644 --- a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_editimp.h" -#include "include/fwl_barcodeimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h" // static IFWL_Barcode* IFWL_Barcode::Create(const CFWL_WidgetImpProperties& properties) { diff --git a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp index a7381e1ea6..44e691c5ed 100644 --- a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_caretimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_caretimp.h" // static IFWL_Caret* IFWL_Caret::Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp index 08f15e74f0..3df1f21391 100644 --- a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_widgetmgrimp.h" -#include "include/fwl_checkboximp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h" #define FWL_CKB_CaptionMargin 5 // static diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp index f1a80df790..e3e823aac5 100644 --- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp @@ -4,20 +4,20 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../../src/core/include/fwl_threadimp.h" -#include "../../src/core/include/fwl_appimp.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_panelimp.h" -#include "../core/include/fwl_formimp.h" -#include "../core/include/fwl_widgetmgrimp.h" -#include "include/fwl_scrollbarimp.h" -#include "include/fwl_editimp.h" -#include "include/fwl_listboximp.h" -#include "include/fwl_formproxyimp.h" -#include "include/fwl_comboboximp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" // static IFWL_ComboBox* IFWL_ComboBox::Create( diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp index 2eb7503476..57c2126e82 100644 --- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_panelimp.h" -#include "../core/include/fwl_formimp.h" -#include "../core/include/fwl_widgetmgrimp.h" -#include "include/fwl_formproxyimp.h" -#include "include/fwl_editimp.h" -#include "include/fwl_monthcalendarimp.h" -#include "include/fwl_datetimepickerimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h" #define FWL_DTP_WIDTH 100 #define FWL_DTP_HEIGHT 20 diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp index c9ce62ece7..9b652a79fc 100644 --- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_threadimp.h" -#include "../core/include/fwl_appimp.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_widgetmgrimp.h" -#include "include/fwl_caretimp.h" -#include "include/fwl_comboboximp.h" -#include "include/fwl_editimp.h" -#include "include/fwl_scrollbarimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_caretimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" // static IFWL_Edit* IFWL_Edit::Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp index 20ec712537..9f7ff23449 100644 --- a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_panelimp.h" -#include "../core/include/fwl_formimp.h" -#include "include/fwl_formproxyimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" CFWL_FormProxyImp::CFWL_FormProxyImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter) diff --git a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp index 3ef6b443ce..9e42d56f74 100644 --- a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_scrollbarimp.h" -#include "include/fwl_listboximp.h" -#include "include/fwl_comboboximp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" #define FWL_LISTBOX_ItemTextMargin 2 diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp index 12ad6bd45a..3e038299a8 100644 --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_monthcalendarimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h" #define MONTHCAL_HSEP_HEIGHT 1 #define MONTHCAL_VSEP_WIDTH 1 #define MONTHCAL_HMARGIN 3 diff --git a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp index 8650b5545a..9567fc58d5 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_pictureboximp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h" // static IFWL_PictureBox* IFWL_PictureBox::Create( diff --git a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp index e775861749..d9346eab17 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_pushbuttonimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h" // static IFWL_PushButton* IFWL_PushButton::Create( diff --git a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp index f95aeee72c..ed2d22c25c 100644 --- a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_scrollbarimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" #define FWL_SCROLLBAR_Elapse 500 #define FWL_SCROLLBAR_MinThumb 5 diff --git a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp index 00e7dfdb98..c7c1cc66a9 100644 --- a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "include/fwl_spinbuttonimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h" #define FWL_SPN_MinWidth 18 #define FWL_SPN_MinHeight 32 #define FWL_SPIN_Elapse 200 diff --git a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp index 550d36af92..7e2cf5f1c1 100644 --- a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_panelimp.h" -#include "../core/include/fwl_formimp.h" -#include "include/fwl_tooltipctrlimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h" // static IFWL_ToolTip* IFWL_ToolTip::Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp index 3687f8df86..c4f31e4f3a 100644 --- a/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fxmath_barcodeimp.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fxmath_barcodeimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h" static CBC_CodeBase* FX_Barcode_CreateBarCodeEngineObject(BC_TYPE type) { switch (type) { case BC_CODE39: diff --git a/xfa/src/fwl/src/core/fwl_appimp.cpp b/xfa/src/fwl/src/core/fwl_appimp.cpp index 85d34e3690..9ea3e766a6 100644 --- a/xfa/src/fwl/src/core/fwl_appimp.cpp +++ b/xfa/src/fwl/src/core/fwl_appimp.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_widgetmgrimp.h" -#include "include/fwl_appimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" IFWL_App* IFWL_App::Create(IFWL_AdapterNative* pAdapter) { IFWL_App* pApp = new IFWL_App; diff --git a/xfa/src/fwl/src/core/fwl_contentimp.cpp b/xfa/src/fwl/src/core/fwl_contentimp.cpp index 753c59d843..ce323c74d2 100644 --- a/xfa/src/fwl/src/core/fwl_contentimp.cpp +++ b/xfa/src/fwl/src/core/fwl_contentimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_widgetimp.h" -#include "include/fwl_contentimp.h" -#include "include/fwl_widgetmgrimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_contentimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" FWL_ERR IFWL_Content::InsertWidget(IFWL_Widget* pChild, int32_t nIndex) { return static_cast(GetImpl())->InsertWidget(pChild, nIndex); } diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/src/core/fwl_formimp.cpp index bd2e5aa454..1627741dd7 100644 --- a/xfa/src/fwl/src/core/fwl_formimp.cpp +++ b/xfa/src/fwl/src/core/fwl_formimp.cpp @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_widgetimp.h" -#include "include/fwl_panelimp.h" -#include "include/fwl_formimp.h" -#include "include/fwl_widgetmgrimp.h" -#include "include/fwl_appimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" #define FWL_SYSBTNSIZE 21 diff --git a/xfa/src/fwl/src/core/fwl_gridimp.cpp b/xfa/src/fwl/src/core/fwl_gridimp.cpp index 4524e9e423..c16b8caffa 100644 --- a/xfa/src/fwl/src/core/fwl_gridimp.cpp +++ b/xfa/src/fwl/src/core/fwl_gridimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_widgetimp.h" -#include "include/fwl_contentimp.h" -#include "include/fwl_gridimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_contentimp.h" +#include "xfa/src/fwl/src/core/include/fwl_gridimp.h" // static IFWL_Grid* IFWL_Grid::Create(const CFWL_WidgetImpProperties& properties) { diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp index e4d68c72d8..7bdf90c07a 100644 --- a/xfa/src/fwl/src/core/fwl_noteimp.cpp +++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_widgetimp.h" -#include "include/fwl_widgetmgrimp.h" -#include "include/fwl_panelimp.h" -#include "include/fwl_formimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_appimp.h" -#include "../../src/basewidget/include/fwl_tooltipctrlimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h" CFWL_NoteLoop::CFWL_NoteLoop(CFWL_WidgetImp* pForm) : m_pForm(pForm), m_bContinueModal(TRUE) {} FX_BOOL CFWL_NoteLoop::PreProcessMessage(CFWL_Message* pMessage) { diff --git a/xfa/src/fwl/src/core/fwl_panelimp.cpp b/xfa/src/fwl/src/core/fwl_panelimp.cpp index cdae399195..6c0ba87182 100644 --- a/xfa/src/fwl/src/core/fwl_panelimp.cpp +++ b/xfa/src/fwl/src/core/fwl_panelimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_widgetimp.h" -#include "include/fwl_panelimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" // static IFWL_Panel* IFWL_Panel::Create(CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp index 96776f2707..c26a62e0a6 100644 --- a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp +++ b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_widgetmgrimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" CFWL_SDAdapterWidgetMgr::CFWL_SDAdapterWidgetMgr() {} CFWL_SDAdapterWidgetMgr::~CFWL_SDAdapterWidgetMgr() {} FWL_ERR CFWL_SDAdapterWidgetMgr::CreateWidget(IFWL_Widget* pWidget, diff --git a/xfa/src/fwl/src/core/fwl_targetimp.cpp b/xfa/src/fwl/src/core/fwl_targetimp.cpp index b72a6a7923..1e4f7094dc 100644 --- a/xfa/src/fwl/src/core/fwl_targetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_targetimp.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" FWL_ERR IFWL_Target::GetClassName(CFX_WideString& wsClass) const { return m_pImpl->GetClassName(wsClass); } diff --git a/xfa/src/fwl/src/core/fwl_threadimp.cpp b/xfa/src/fwl/src/core/fwl_threadimp.cpp index 6d399527b6..8b2ca37ed9 100644 --- a/xfa/src/fwl/src/core/fwl_threadimp.cpp +++ b/xfa/src/fwl/src/core/fwl_threadimp.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_appimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" void IFWL_Thread::Release() { delete m_pImpl; diff --git a/xfa/src/fwl/src/core/fwl_timerimp.cpp b/xfa/src/fwl/src/core/fwl_timerimp.cpp index 8793e411ca..71dc66f796 100644 --- a/xfa/src/fwl/src/core/fwl_timerimp.cpp +++ b/xfa/src/fwl/src/core/fwl_timerimp.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_appimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" FWL_HTIMER FWL_StartTimer(IFWL_Timer* pTimer, FX_DWORD dwElapse, FX_BOOL bImmediately) { diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp index c3c6e18744..88db9b30e2 100644 --- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_appimp.h" -#include "include/fwl_widgetmgrimp.h" -#include "include/fwl_widgetimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" FWL_ERR IFWL_Widget::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) { return static_cast(GetImpl()) ->GetWidgetRect(rect, bAutoSize); diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp index 2f3aa2aa2a..b8a13e9399 100644 --- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "include/fwl_targetimp.h" -#include "include/fwl_noteimp.h" -#include "include/fwl_widgetmgrimp.h" -#include "include/fwl_threadimp.h" -#include "include/fwl_appimp.h" -#define FWL_NORMALMATRIX +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" + FX_BOOL FWL_UseOffscreen(IFWL_Widget* pWidget) { #if (_FX_OS_ == _FX_MACOSX_) return FALSE; diff --git a/xfa/src/fwl/src/lightwidget/app.cpp b/xfa/src/fwl/src/lightwidget/app.cpp index 293a258f6b..396259ba7f 100644 --- a/xfa/src/fwl/src/lightwidget/app.cpp +++ b/xfa/src/fwl/src/lightwidget/app.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_App::CFWL_App() : m_pIface(IFWL_App::Create(nullptr)), m_pTheme(nullptr) {} CFWL_App::~CFWL_App() { if (m_pTheme) { diff --git a/xfa/src/fwl/src/lightwidget/barcode.cpp b/xfa/src/fwl/src/lightwidget/barcode.cpp index 1868b12686..7cf73eff94 100644 --- a/xfa/src/fwl/src/lightwidget/barcode.cpp +++ b/xfa/src/fwl/src/lightwidget/barcode.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_Barcode* CFWL_Barcode::Create() { return new CFWL_Barcode; diff --git a/xfa/src/fwl/src/lightwidget/caret.cpp b/xfa/src/fwl/src/lightwidget/caret.cpp index dcf6852ec0..0268f0d97f 100644 --- a/xfa/src/fwl/src/lightwidget/caret.cpp +++ b/xfa/src/fwl/src/lightwidget/caret.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_Caret* CFWL_Caret::Create() { return new CFWL_Caret; diff --git a/xfa/src/fwl/src/lightwidget/checkbox.cpp b/xfa/src/fwl/src/lightwidget/checkbox.cpp index ea72cb622d..9a34a1dae2 100644 --- a/xfa/src/fwl/src/lightwidget/checkbox.cpp +++ b/xfa/src/fwl/src/lightwidget/checkbox.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_CheckBox* CFWL_CheckBox::Create() { return new CFWL_CheckBox; diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/src/lightwidget/combobox.cpp index 5756a6d832..21ecde5486 100644 --- a/xfa/src/fwl/src/lightwidget/combobox.cpp +++ b/xfa/src/fwl/src/lightwidget/combobox.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_ComboBox* CFWL_ComboBox::Create() { return new CFWL_ComboBox; diff --git a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp index 1ceb4698e5..f12765e770 100644 --- a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp +++ b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_DateTimePicker* CFWL_DateTimePicker::Create() { return new CFWL_DateTimePicker; diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/src/lightwidget/edit.cpp index d16c57b964..f52859adcb 100644 --- a/xfa/src/fwl/src/lightwidget/edit.cpp +++ b/xfa/src/fwl/src/lightwidget/edit.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_Edit* CFWL_Edit::Create() { return new CFWL_Edit; diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/src/lightwidget/listbox.cpp index 541baf4fed..198e1fe142 100644 --- a/xfa/src/fwl/src/lightwidget/listbox.cpp +++ b/xfa/src/fwl/src/lightwidget/listbox.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_ListBox* CFWL_ListBox::Create() { return new CFWL_ListBox; diff --git a/xfa/src/fwl/src/lightwidget/picturebox.cpp b/xfa/src/fwl/src/lightwidget/picturebox.cpp index 33ca399c78..b050b80791 100644 --- a/xfa/src/fwl/src/lightwidget/picturebox.cpp +++ b/xfa/src/fwl/src/lightwidget/picturebox.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_PictureBox* CFWL_PictureBox::Create() { return new CFWL_PictureBox; diff --git a/xfa/src/fwl/src/lightwidget/pushbutton.cpp b/xfa/src/fwl/src/lightwidget/pushbutton.cpp index 9efe11cba1..16eaf1ce6c 100644 --- a/xfa/src/fwl/src/lightwidget/pushbutton.cpp +++ b/xfa/src/fwl/src/lightwidget/pushbutton.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_PushButton* CFWL_PushButton::Create() { return new CFWL_PushButton; diff --git a/xfa/src/fwl/src/lightwidget/scrollbar.cpp b/xfa/src/fwl/src/lightwidget/scrollbar.cpp index 6bca86c98c..3d99e10734 100644 --- a/xfa/src/fwl/src/lightwidget/scrollbar.cpp +++ b/xfa/src/fwl/src/lightwidget/scrollbar.cpp @@ -6,7 +6,7 @@ #include -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_ScrollBar* CFWL_ScrollBar::Create() { return new CFWL_ScrollBar; diff --git a/xfa/src/fwl/src/lightwidget/theme.cpp b/xfa/src/fwl/src/lightwidget/theme.cpp index 133062907b..2e8bfb58d1 100644 --- a/xfa/src/fwl/src/lightwidget/theme.cpp +++ b/xfa/src/fwl/src/lightwidget/theme.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" FX_BOOL CFWL_Theme::IsValidWidget(IFWL_Widget* pWidget) { return !!GetTheme(pWidget); } diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp index 908fe3d357..7a2b2033bb 100644 --- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp +++ b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp @@ -6,13 +6,13 @@ #include -#include "../../../foxitlib.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_panelimp.h" -#include "../core/include/fwl_formimp.h" -#include "../core/include/fwl_threadimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" CFWL_ToolTip* CFWL_ToolTip::Create() { return new CFWL_ToolTip; diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/src/lightwidget/widget.cpp index 6cb6fa77d9..76a90cc5c3 100644 --- a/xfa/src/fwl/src/lightwidget/widget.cpp +++ b/xfa/src/fwl/src/lightwidget/widget.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../../src/core/include/fwl_noteimp.h" -#include "../core/include/fwl_targetimp.h" -#include "../core/include/fwl_noteimp.h" -#include "../core/include/fwl_widgetimp.h" -#include "../core/include/fwl_widgetmgrimp.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" CFWL_WidgetImpProperties CFWL_WidgetProperties::MakeWidgetImpProperties( IFWL_DataProvider* pDataProvider) const { diff --git a/xfa/src/fwl/src/theme/barcodetp.cpp b/xfa/src/fwl/src/theme/barcodetp.cpp index 3257226033..fb0f993b90 100644 --- a/xfa/src/fwl/src/theme/barcodetp.cpp +++ b/xfa/src/fwl/src/theme/barcodetp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_BarcodeTP::CFWL_BarcodeTP() {} CFWL_BarcodeTP::~CFWL_BarcodeTP() {} FX_BOOL CFWL_BarcodeTP::IsValidWidget(IFWL_Widget* pWidget) { diff --git a/xfa/src/fwl/src/theme/carettp.cpp b/xfa/src/fwl/src/theme/carettp.cpp index 2271ee958b..cc7d751b75 100644 --- a/xfa/src/fwl/src/theme/carettp.cpp +++ b/xfa/src/fwl/src/theme/carettp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_CaretTP::CFWL_CaretTP() {} CFWL_CaretTP::~CFWL_CaretTP() {} FX_BOOL CFWL_CaretTP::IsValidWidget(IFWL_Widget* pWidget) { diff --git a/xfa/src/fwl/src/theme/checkboxtp.cpp b/xfa/src/fwl/src/theme/checkboxtp.cpp index 7fc0d1e41c..cb81a7f2cf 100644 --- a/xfa/src/fwl/src/theme/checkboxtp.cpp +++ b/xfa/src/fwl/src/theme/checkboxtp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #define CHECKBOX_SIZE_SIGNMARGIN 3 #define CHECKBOX_SIZE_SIGNBORDER 2 #define CHECKBOX_SIZE_SIGNPATH 100 diff --git a/xfa/src/fwl/src/theme/comboboxtp.cpp b/xfa/src/fwl/src/theme/comboboxtp.cpp index ab5947d3fa..efc02fa380 100644 --- a/xfa/src/fwl/src/theme/comboboxtp.cpp +++ b/xfa/src/fwl/src/theme/comboboxtp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #define FWLTHEME_CAPACITY_ComboFormHandler 8.0f CFWL_ComboBoxTP::CFWL_ComboBoxTP() { m_dwThemeID = 0; diff --git a/xfa/src/fwl/src/theme/datetimepickertp.cpp b/xfa/src/fwl/src/theme/datetimepickertp.cpp index 966fdd64d4..f579eca948 100644 --- a/xfa/src/fwl/src/theme/datetimepickertp.cpp +++ b/xfa/src/fwl/src/theme/datetimepickertp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_DateTimePickerTP::CFWL_DateTimePickerTP() { m_pThemeData = new DTPThemeData; initThemeData(); diff --git a/xfa/src/fwl/src/theme/edittp.cpp b/xfa/src/fwl/src/theme/edittp.cpp index 2aebc5dae0..c3a3892e39 100644 --- a/xfa/src/fwl/src/theme/edittp.cpp +++ b/xfa/src/fwl/src/theme/edittp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_EditTP::CFWL_EditTP() {} CFWL_EditTP::~CFWL_EditTP() {} FX_BOOL CFWL_EditTP::IsValidWidget(IFWL_Widget* pWidget) { diff --git a/xfa/src/fwl/src/theme/formtp.cpp b/xfa/src/fwl/src/theme/formtp.cpp index f7e3f4904c..635244deb3 100644 --- a/xfa/src/fwl/src/theme/formtp.cpp +++ b/xfa/src/fwl/src/theme/formtp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #define FWLTHEME_CAPACITY_CXFormBorder 3 #define FWLTHEME_CAPACITY_CYFormBorder 3 #define FWLTHEME_CAPACITY_CYNarrowCaption 18 diff --git a/xfa/src/fwl/src/theme/listboxtp.cpp b/xfa/src/fwl/src/theme/listboxtp.cpp index 3e19cf7697..f9e7ae6614 100644 --- a/xfa/src/fwl/src/theme/listboxtp.cpp +++ b/xfa/src/fwl/src/theme/listboxtp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_ListBoxTP::CFWL_ListBoxTP() {} CFWL_ListBoxTP::~CFWL_ListBoxTP() {} FX_BOOL CFWL_ListBoxTP::IsValidWidget(IFWL_Widget* pWidget) { diff --git a/xfa/src/fwl/src/theme/monthcalendartp.cpp b/xfa/src/fwl/src/theme/monthcalendartp.cpp index b3897a2d63..55ff787d51 100644 --- a/xfa/src/fwl/src/theme/monthcalendartp.cpp +++ b/xfa/src/fwl/src/theme/monthcalendartp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #define FWL_THEMECAPACITY_MC_HEADER_WIDTH 200 #define FWL_THEMECAPACITY_MC_HEADER_HEIGHT 30 #define FWL_THEMECAPACITY_MC_HEADER_BTN_WIDTH 18 diff --git a/xfa/src/fwl/src/theme/pictureboxtp.cpp b/xfa/src/fwl/src/theme/pictureboxtp.cpp index 122cb3e5fa..52c7e44cc5 100644 --- a/xfa/src/fwl/src/theme/pictureboxtp.cpp +++ b/xfa/src/fwl/src/theme/pictureboxtp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" CFWL_PictureBoxTP::CFWL_PictureBoxTP() {} CFWL_PictureBoxTP::~CFWL_PictureBoxTP() {} FX_BOOL CFWL_PictureBoxTP::IsValidWidget(IFWL_Widget* pWidget) { diff --git a/xfa/src/fwl/src/theme/pushbuttontp.cpp b/xfa/src/fwl/src/theme/pushbuttontp.cpp index fe142d241f..267c4fe07f 100644 --- a/xfa/src/fwl/src/theme/pushbuttontp.cpp +++ b/xfa/src/fwl/src/theme/pushbuttontp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #define PUSHBUTTON_SIZE_Corner 2 CFWL_PushButtonTP::CFWL_PushButtonTP() { m_pThemeData = new PBThemeData; diff --git a/xfa/src/fwl/src/theme/scrollbartp.cpp b/xfa/src/fwl/src/theme/scrollbartp.cpp index caf5562e28..e9560ea443 100644 --- a/xfa/src/fwl/src/theme/scrollbartp.cpp +++ b/xfa/src/fwl/src/theme/scrollbartp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" #define FWL_SCROLL_PawLen 12.5f CFWL_ScrollBarTP::CFWL_ScrollBarTP() { m_pThemeData = new SBThemeData; diff --git a/xfa/src/fwl/src/theme/widgettp.cpp b/xfa/src/fwl/src/theme/widgettp.cpp index 959746761e..7eaf6e881b 100644 --- a/xfa/src/fwl/src/theme/widgettp.cpp +++ b/xfa/src/fwl/src/theme/widgettp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" +#include "xfa/src/foxitlib.h" static void FWL_SetChildThemeID(IFWL_Widget* pParent, FX_DWORD dwThemeID) { IFWL_WidgetMgr* pWidgetMgr = FWL_GetWidgetMgr(); IFWL_Widget* pChild = diff --git a/xfa/src/fxbarcode/BC_BarCode.cpp b/xfa/src/fxbarcode/BC_BarCode.cpp index 2bc0559b12..82af104bf3 100644 --- a/xfa/src/fxbarcode/BC_BarCode.cpp +++ b/xfa/src/fxbarcode/BC_BarCode.cpp @@ -20,66 +20,66 @@ * limitations under the License. */ -#include "barcode.h" -#include "BC_Reader.h" -#include "BC_Writer.h" -#include "BC_DecoderResult.h" -#include "BC_LuminanceSource.h" -#include "BC_BufferedImageLuminanceSource.h" -#include "BC_Binarizer.h" -#include "BC_BinaryBitmap.h" -#include "BC_UtilCodingConvert.h" -#include "BC_ResultPoint.h" -#include "BC_BinaryBitmap.h" -#include "BC_TwoDimWriter.h" -#include "common/BC_GlobalHistogramBinarizer.h" -#include "common/BC_CommonBitMatrix.h" -#include "common/BC_CommonBitArray.h" -#include "common/BC_CommonBitMatrix.h" -#include "common/BC_CommonDecoderResult.h" -#include "datamatrix/BC_DataMatrixReader.h" -#include "datamatrix/BC_DataMatrixWriter.h" -#include "oned/BC_OneDReader.h" -#include "oned/BC_OneDimReader.h" -#include "oned/BC_OneDimWriter.h" -#include "oned/BC_OnedCode39Reader.h" -#include "oned/BC_OnedCode39Writer.h" -#include "oned/BC_OnedCodaBarReader.h" -#include "oned/BC_OnedCodaBarWriter.h" -#include "oned/BC_OnedCode128Reader.h" -#include "oned/BC_OnedCode128Writer.h" -#include "oned/BC_OnedEAN8Reader.h" -#include "oned/BC_OnedEAN8Writer.h" -#include "oned/BC_OnedEAN13Reader.h" -#include "oned/BC_OnedEAN13Writer.h" -#include "oned/BC_OnedUPCAReader.h" -#include "oned/BC_OnedUPCAWriter.h" -#include "pdf417/BC_PDF417DetectorResult.h" -#include "pdf417/BC_PDF417Compaction.h" -#include "pdf417/BC_PDF417.h" -#include "pdf417/BC_PDF417Writer.h" -#include "pdf417/BC_PDF417Detector.h" -#include "pdf417/BC_PDF417DetectorResult.h" -#include "pdf417/BC_PDF417Codeword.h" -#include "pdf417/BC_PDF417Common.h" -#include "pdf417/BC_PDF417BarcodeValue.h" -#include "pdf417/BC_PDF417BarcodeMetadata.h" -#include "pdf417/BC_PDF417BoundingBox.h" -#include "pdf417/BC_PDF417DetectionResultColumn.h" -#include "pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" -#include "pdf417/BC_PDF417DetectionResult.h" -#include "pdf417/BC_PDF417DecodedBitStreamParser.h" -#include "pdf417/BC_PDF417CodewordDecoder.h" -#include "pdf417/BC_PDF417DecodedBitStreamParser.h" -#include "pdf417/BC_PDF417ECModulusPoly.h" -#include "pdf417/BC_PDF417ECModulusGF.h" -#include "pdf417/BC_PDF417ECErrorCorrection.h" -#include "pdf417/BC_PDF417DecodedBitStreamParser.h" -#include "pdf417/BC_PDF417ScanningDecoder.h" -#include "pdf417/BC_PDF417Reader.h" -#include "pdf417/BC_PDF417HighLevelEncoder.h" -#include "qrcode/BC_QRCodeReader.h" -#include "qrcode/BC_QRCodeWriter.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/BC_DecoderResult.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h" +#include "xfa/src/fxbarcode/BC_Binarizer.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" +#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h" CBC_CodeBase::CBC_CodeBase() {} CBC_CodeBase::~CBC_CodeBase() {} FX_BOOL CBC_CodeBase::SetCharEncoding(int32_t encoding) { diff --git a/xfa/src/fxbarcode/BC_Binarizer.cpp b/xfa/src/fxbarcode/BC_Binarizer.cpp index 8b45e19cf9..314bf5760b 100644 --- a/xfa/src/fxbarcode/BC_Binarizer.cpp +++ b/xfa/src/fxbarcode/BC_Binarizer.cpp @@ -20,11 +20,11 @@ * limitations under the License. */ -#include "barcode.h" -#include "BC_LuminanceSource.h" -#include "BC_Binarizer.h" -#include "common/BC_CommonBitMatrix.h" -#include "common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/BC_Binarizer.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" CBC_Binarizer::CBC_Binarizer(CBC_LuminanceSource* source) { m_source = source; } diff --git a/xfa/src/fxbarcode/BC_BinaryBitmap.cpp b/xfa/src/fxbarcode/BC_BinaryBitmap.cpp index 50a87126a7..2fdcb9904d 100644 --- a/xfa/src/fxbarcode/BC_BinaryBitmap.cpp +++ b/xfa/src/fxbarcode/BC_BinaryBitmap.cpp @@ -20,12 +20,12 @@ * limitations under the License. */ -#include "barcode.h" -#include "BC_Binarizer.h" -#include "BC_LuminanceSource.h" -#include "BC_BinaryBitmap.h" -#include "common/BC_CommonBitMatrix.h" -#include "common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Binarizer.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" CBC_BinaryBitmap::CBC_BinaryBitmap(CBC_Binarizer* binarizer) : m_binarizer(binarizer), m_matrix(NULL) {} CBC_BinaryBitmap::~CBC_BinaryBitmap() { diff --git a/xfa/src/fxbarcode/BC_Dimension.cpp b/xfa/src/fxbarcode/BC_Dimension.cpp index 13cc8d5ede..e22810022c 100644 --- a/xfa/src/fxbarcode/BC_Dimension.cpp +++ b/xfa/src/fxbarcode/BC_Dimension.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "barcode.h" -#include "BC_Dimension.h" -#include "datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" CBC_Dimension::CBC_Dimension() {} CBC_Dimension::CBC_Dimension(int32_t width, int32_t height, int32_t& e) { if (width < 0 || height < 0) { diff --git a/xfa/src/fxbarcode/BC_Library.cpp b/xfa/src/fxbarcode/BC_Library.cpp index 5f875b9770..7f142989ae 100644 --- a/xfa/src/fxbarcode/BC_Library.cpp +++ b/xfa/src/fxbarcode/BC_Library.cpp @@ -4,88 +4,88 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "barcode.h" -#include "BC_Reader.h" -#include "BC_UtilCodingConvert.h" -#include "BC_BinaryBitmap.h" -#include "BC_LuminanceSource.h" -#include "BC_BufferedImageLuminanceSource.h" -#include "BC_Binarizer.h" -#include "BC_Writer.h" -#include "BC_Dimension.h" -#include "BC_UtilCodingConvert.h" -#include "BC_ResultPoint.h" -#include "BC_BinaryBitmap.h" -#include "BC_DecoderResult.h" -#include "BC_TwoDimWriter.h" -#include "common/BC_GlobalHistogramBinarizer.h" -#include "common/BC_CommonBitMatrix.h" -#include "common/reedsolomon/BC_ReedSolomonGF256.h" -#include "common/BC_CommonByteMatrix.h" -#include "common/BC_CommonBitMatrix.h" -#include "common/BC_CommonBitArray.h" -#include "common/BC_CommonBitMatrix.h" -#include "common/BC_CommonDecoderResult.h" -#include "datamatrix/BC_DataMatrixVersion.h" -#include "datamatrix/BC_DataMatrixReader.h" -#include "datamatrix/BC_Encoder.h" -#include "datamatrix/BC_DefaultPlacement.h" -#include "datamatrix/BC_SymbolShapeHint.h" -#include "datamatrix/BC_SymbolInfo.h" -#include "datamatrix/BC_DataMatrixSymbolInfo144.h" -#include "datamatrix/BC_ErrorCorrection.h" -#include "datamatrix/BC_EncoderContext.h" -#include "datamatrix/BC_C40Encoder.h" -#include "datamatrix/BC_TextEncoder.h" -#include "datamatrix/BC_X12Encoder.h" -#include "datamatrix/BC_EdifactEncoder.h" -#include "datamatrix/BC_Base256Encoder.h" -#include "datamatrix/BC_ASCIIEncoder.h" -#include "datamatrix/BC_HighLevelEncoder.h" -#include "datamatrix/BC_DataMatrixWriter.h" -#include "oned/BC_OneDReader.h" -#include "oned/BC_OnedCode128Reader.h" -#include "oned/BC_OnedCode39Reader.h" -#include "oned/BC_OneDimReader.h" -#include "oned/BC_OnedEAN13Reader.h" -#include "oned/BC_OnedEAN8Reader.h" -#include "oned/BC_OnedUPCAReader.h" -#include "oned/BC_OnedCodaBarReader.h" -#include "oned/BC_OneDimWriter.h" -#include "oned/BC_OnedCode128Writer.h" -#include "oned/BC_OnedCode39Writer.h" -#include "oned/BC_OnedEAN13Writer.h" -#include "oned/BC_OnedEAN8Writer.h" -#include "oned/BC_OnedUPCAWriter.h" -#include "pdf417/BC_PDF417DetectorResult.h" -#include "pdf417/BC_PDF417Compaction.h" -#include "pdf417/BC_PDF417HighLevelEncoder.h" -#include "pdf417/BC_PDF417Detector.h" -#include "pdf417/BC_PDF417DetectorResult.h" -#include "pdf417/BC_PDF417Codeword.h" -#include "pdf417/BC_PDF417Common.h" -#include "pdf417/BC_PDF417BarcodeValue.h" -#include "pdf417/BC_PDF417BarcodeMetadata.h" -#include "pdf417/BC_PDF417BoundingBox.h" -#include "pdf417/BC_PDF417DetectionResultColumn.h" -#include "pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" -#include "pdf417/BC_PDF417DetectionResult.h" -#include "pdf417/BC_PDF417DecodedBitStreamParser.h" -#include "pdf417/BC_PDF417CodewordDecoder.h" -#include "pdf417/BC_PDF417DecodedBitStreamParser.h" -#include "pdf417/BC_PDF417ECModulusPoly.h" -#include "pdf417/BC_PDF417ECModulusGF.h" -#include "pdf417/BC_PDF417ECErrorCorrection.h" -#include "pdf417/BC_PDF417DecodedBitStreamParser.h" -#include "pdf417/BC_PDF417ScanningDecoder.h" -#include "pdf417/BC_PDF417Reader.h" -#include "qrcode/BC_QRCodeReader.h" -#include "qrcode/BC_QRCodeWriter.h" -#include "qrcode/BC_QRCoderErrorCorrectionLevel.h" -#include "qrcode/BC_QRCoderMode.h" -#include "qrcode/BC_QRCoderVersion.h" -#include "qrcode/BC_QRDataMask.h" -#include "qrcode/BC_QRDecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h" +#include "xfa/src/fxbarcode/BC_Binarizer.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_DecoderResult.h" +#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" +#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h" void BC_Library_Init() { CBC_QRCoderErrorCorrectionLevel::Initialize(); CBC_QRCoderMode::Initialize(); diff --git a/xfa/src/fxbarcode/BC_TwoDimWriter.cpp b/xfa/src/fxbarcode/BC_TwoDimWriter.cpp index 9cb97f4a54..d6d6614449 100644 --- a/xfa/src/fxbarcode/BC_TwoDimWriter.cpp +++ b/xfa/src/fxbarcode/BC_TwoDimWriter.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "barcode.h" -#include "common/BC_CommonBitMatrix.h" -#include "BC_Writer.h" -#include "BC_TwoDimWriter.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" CBC_TwoDimWriter::CBC_TwoDimWriter() { m_iCorrectLevel = 1; m_bFixedSize = TRUE; diff --git a/xfa/src/fxbarcode/barcode.h b/xfa/src/fxbarcode/barcode.h index 333d3f7a11..d878f2d8a7 100644 --- a/xfa/src/fxbarcode/barcode.h +++ b/xfa/src/fxbarcode/barcode.h @@ -4,5 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../foxitlib.h" +// TODO(thestig): Remove this file and do IWYU. + +#include "xfa/src/foxitlib.h" #include "utils.h" diff --git a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp index d0d0d8ea54..61b4ce3b4f 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonBitArray.h" CBC_CommonBitArray::CBC_CommonBitArray(CBC_CommonBitArray* array) { m_size = array->GetSize(); diff --git a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp index ec2706b122..c45e28c0c8 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonBitArray.h" #include "BC_CommonBitMatrix.h" CBC_CommonBitMatrix::CBC_CommonBitMatrix() { diff --git a/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp index 20b0d2accc..c308638fad 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonBitSource.h" CBC_CommonBitSource::CBC_CommonBitSource(CFX_ByteArray* bytes) { m_bytes.Copy((*bytes)); diff --git a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp index 0ad07fd981..967a1849d5 100644 --- a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonByteArray.h" CBC_CommonByteArray::CBC_CommonByteArray() { m_bytes = NULL; diff --git a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp index d6208d41b5..875b8026c9 100644 --- a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonByteMatrix.h" CBC_CommonByteMatrix::CBC_CommonByteMatrix(int32_t width, int32_t height) { m_height = height; diff --git a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp index fbc6607ae7..2beb850963 100644 --- a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonECI.h" #include "BC_CommonCharacterSetECI.h" void CBC_CommonCharacterSetECI::initialize() {} diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp index d5f97029f4..1bf9f57981 100644 --- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../qrcode/BC_QRCoderErrorCorrectionLevel.h" -#include "../pdf417/BC_PDF417ResultMetadata.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h" #include "BC_CommonDecoderResult.h" CBC_CommonDecoderResult::CBC_CommonDecoderResult() {} void CBC_CommonDecoderResult::Init(const CFX_ByteArray& rawBytes, diff --git a/xfa/src/fxbarcode/common/BC_CommonECI.cpp b/xfa/src/fxbarcode/common/BC_CommonECI.cpp index 08cddc90a6..d9f918b025 100644 --- a/xfa/src/fxbarcode/common/BC_CommonECI.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonECI.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonECI.h" #include "BC_CommonCharacterSetECI.h" CBC_CommonECI::CBC_CommonECI(int32_t value) { diff --git a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp index 8a4687036e..3fd2e4a893 100644 --- a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_CommonPerspectiveTransform.h" CBC_CommonPerspectiveTransform::CBC_CommonPerspectiveTransform(FX_FLOAT a11, FX_FLOAT a21, diff --git a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp index 5a15c36f01..24c17712cc 100644 --- a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp +++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Binarizer.h" -#include "../BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Binarizer.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" #include "BC_CommonBitMatrix.h" #include "BC_CommonBitArray.h" #include "BC_GlobalHistogramBinarizer.h" diff --git a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp index 368a12efd7..a01eaee3ac 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 "../barcode.h" -#include "BC_WhiteRectangleDetector.h" -#include "BC_CommonBitMatrix.h" -#include "../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" 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 c2ddd0f69f..a14a2d9cb5 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_ReedSolomonGF256.h" #include "BC_ReedSolomonGF256Poly.h" #include "BC_ReedSolomon.h" diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp index b072309a86..4ee87a4fa7 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_ReedSolomonGF256.h" #include "BC_ReedSolomonGF256Poly.h" #include "BC_ReedSolomonDecoder.h" diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp index d862e9a931..0957ca51b7 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_ReedSolomonGF256Poly.h" #include "BC_ReedSolomonGF256.h" CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::QRCodeFild = NULL; diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp index b94508f900..f87cd5ba86 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_ReedSolomonGF256.h" #include "BC_ReedSolomonGF256Poly.h" CBC_ReedSolomonGF256Poly::CBC_ReedSolomonGF256Poly(CBC_ReedSolomonGF256* field, diff --git a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp index 3663b9f84e..2c25c7a8b7 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp index 9df28e1b5b..14f35ab70c 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp index 7e58d8ef06..b2b003848c 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Dimension.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp index 52738a1527..1989c8d2f4 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_DataMatrixVersion.h" #include "BC_DataMatrixBitMatrixParser.h" CBC_DataMatrixBitMatrixParser::CBC_DataMatrixBitMatrixParser() { diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp index ef9f5582b6..0f3239d552 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_DataMatrixVersion.h" #include "BC_DataMatrixDataBlock.h" CBC_DataMatrixDataBlock::~CBC_DataMatrixDataBlock() {} diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp index 8ac6468b3a..1938fb4bb4 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonDecoderResult.h" -#include "../common/BC_CommonBitSource.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitSource.h" #include "BC_DataMatrixDecodedBitStreamParser.h" const FX_CHAR CBC_DataMatrixDecodedBitStreamParser::C40_BASIC_SET_CHARS[] = { '*', '*', '*', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp index 5767c95555..8d886201cd 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../common/reedsolomon/BC_ReedSolomonDecoder.h" -#include "../common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" #include "BC_DataMatrixDecoder.h" #include "BC_DataMatrixBitMatrixParser.h" #include "BC_DataMatrixVersion.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp index 641d2761bb..c930f0e45d 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp @@ -20,13 +20,13 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_ResultPoint.h" -#include "../common/BC_WhiteRectangleDetector.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../qrcode/BC_QRFinderPatternFinder.h" -#include "../qrcode/BC_QRDetectorResult.h" -#include "../qrcode/BC_QRGridSampler.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h" #include "BC_DataMatrixDetector.h" const int32_t CBC_DataMatrixDetector::INTEGERS[5] = {0, 1, 2, 3, 4}; CBC_DataMatrixDetector::CBC_DataMatrixDetector(CBC_CommonBitMatrix* image) diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp index 4c4be46176..9c0c367b75 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp @@ -20,11 +20,11 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_BinaryBitmap.h" -#include "../BC_Reader.h" -#include "../qrcode/BC_QRDetectorResult.h" -#include "../common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "BC_DataMatrixDecoder.h" #include "BC_DataMatrixDetector.h" #include "BC_DataMatrixReader.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp index d6176be909..93cb541dbf 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp index 69257b1b06..d4af9c6d3e 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_DataMatrixVersion.h" CFX_PtrArray* CBC_DataMatrixVersion::VERSIONS = NULL; void CBC_DataMatrixVersion::Initialize() { diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp index d2f2507729..22a04b1ab0 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp @@ -20,14 +20,14 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Writer.h" -#include "../BC_TwoDimWriter.h" -#include "../BC_Dimension.h" -#include "../BC_BinaryBitmap.h" -#include "../BC_UtilCodingConvert.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../common/BC_CommonByteMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" #include "BC_Encoder.h" #include "BC_DefaultPlacement.h" #include "BC_SymbolShapeHint.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp index 86c2a80210..076657b6ff 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_Encoder.h" #include "BC_DefaultPlacement.h" CBC_DefaultPlacement::CBC_DefaultPlacement(CFX_WideString codewords, diff --git a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp index 60b796a196..a0a999fb99 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp index 4858e19fb8..38beb6c87f 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_Encoder.h" CBC_Encoder::CBC_Encoder() {} CBC_Encoder::~CBC_Encoder() {} diff --git a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp index 8b3093c836..9823642818 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Dimension.h" -#include "../BC_UtilCodingConvert.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp index ffb52350c9..dff07db8e3 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp index 4a0e09528b..0b14ef3595 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Dimension.h" -#include "../BC_UtilCodingConvert.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp index b6a19328a8..985eb7be38 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Dimension.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp index d0f0e45846..f3c3d1d6f6 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_SymbolShapeHint.h" CBC_SymbolShapeHint::CBC_SymbolShapeHint() {} CBC_SymbolShapeHint::~CBC_SymbolShapeHint() {} diff --git a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp index ecd20cd5e5..0a6b381c79 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp index a15362f542..690a3245b0 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" #include "BC_Encoder.h" #include "BC_SymbolShapeHint.h" #include "BC_SymbolInfo.h" diff --git a/xfa/src/fxbarcode/oned/BC_OneDReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp index 6e4798b666..61448d21e7 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Reader.h" -#include "../BC_BinaryBitmap.h" -#include "../common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "BC_OneDReader.h" const int32_t CBC_OneDReader::INTEGER_MATH_SHIFT = 8; const int32_t CBC_OneDReader::PATTERN_MATCH_RESULT_SCALE_FACTOR = 1 << 8; diff --git a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp index 67bfd80995..b6ef6749b8 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Reader.h" -#include "../common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "BC_OneDReader.h" #include "BC_OneDimReader.h" const int32_t CBC_OneDimReader::MAX_AVG_VARIANCE = (int32_t)(256 * 0.48f); diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp index 662e773af3..8f4b226e8c 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp @@ -24,9 +24,9 @@ #include -#include "../BC_Writer.h" -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" CBC_OneDimWriter::CBC_OneDimWriter() { m_locTextLoc = BC_TEXT_LOC_BELOWEMBED; diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp index 010406be8d..a2177fd699 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp @@ -20,12 +20,12 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Reader.h" -#include "../common/BC_CommonBitArray.h" -#include "../oned/BC_OneDReader.h" -#include "../oned/BC_OnedCode39Reader.h" -#include "../oned/BC_OnedCodaBarReader.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h" const FX_CHAR* CBC_OnedCodaBarReader::ALPHABET_STRING = "0123456789-$:/.+ABCDTN"; const int32_t CBC_OnedCodaBarReader::CHARACTER_ENCODINGS[22] = { diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp index a2e27faff8..9c76ca78ba 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp @@ -20,11 +20,11 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Writer.h" -#include "../BC_Reader.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "BC_OneDReader.h" #include "BC_OneDimWriter.h" #include "BC_OnedCodaBarReader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp index c1f74c8a61..601baa2a4c 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Reader.h" -#include "../common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "BC_OneDReader.h" #include "BC_OnedCode128Reader.h" const int32_t CBC_OnedCode128Reader::CODE_PATTERNS[107][7] = { diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp index bdea697841..118d426cf4 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Writer.h" -#include "../BC_Reader.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/BC_Reader.h" #include "BC_OneDReader.h" #include "BC_OneDimWriter.h" #include "BC_OnedCode128Reader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp index 99484493f3..a5b77ed13f 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Reader.h" -#include "../common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "BC_OneDReader.h" #include "BC_OnedCode39Reader.h" const FX_CHAR* CBC_OnedCode39Reader::ALPHABET_STRING = diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp index cd01d93b8a..d90cde1973 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Writer.h" -#include "../BC_Reader.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_OneDReader.h" #include "BC_OneDimWriter.h" #include "BC_OnedCode39Reader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp index 74c4cd9826..f822c3c4b0 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Reader.h" -#include "../common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "BC_OneDReader.h" #include "BC_OneDimReader.h" #include "BC_OnedEAN13Reader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp index 0e38ab283b..3e5e9dd104 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Writer.h" -#include "../BC_Reader.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/BC_Reader.h" #include "BC_OneDReader.h" #include "BC_OneDimReader.h" #include "BC_OneDimWriter.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp index d860bbe9e7..6dbe046098 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Reader.h" -#include "../common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "BC_OneDReader.h" #include "BC_OneDimReader.h" #include "BC_OnedEAN8Reader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp index fcf781fd60..f26486d461 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Writer.h" -#include "../BC_Reader.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_OneDReader.h" #include "BC_OneDimWriter.h" #include "BC_OneDimReader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp index d02e2a2966..7acb0ad698 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Reader.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.h" #include "BC_OneDReader.h" #include "BC_OneDimReader.h" #include "BC_OnedEAN13Reader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp index b3f9dc3f86..2934ed97e0 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Writer.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Writer.h" #include "BC_OneDimWriter.h" #include "BC_OnedEAN13Writer.h" #include "BC_OnedUPCAWriter.h" diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp index a3db95ddf5..b506862b63 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417Compaction.h" #include "BC_PDF417BarcodeRow.h" #include "BC_PDF417BarcodeMatrix.h" diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp index 2386ba4e2e..dadfbb2413 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417BarcodeRow.h" #include "BC_PDF417BarcodeMatrix.h" CBC_BarcodeMatrix::CBC_BarcodeMatrix(int32_t height, int32_t width) { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp index 44d71aaec1..ed0136efb8 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417BarcodeMetadata.h" CBC_BarcodeMetadata::CBC_BarcodeMetadata(int32_t columnCount, int32_t rowCountUpperPart, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp index 82e5834c55..e472f0ef3a 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417BarcodeRow.h" CBC_BarcodeRow::CBC_BarcodeRow(int32_t width) { m_row.SetSize(width); diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp index 2bb3c45a18..e33193199f 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417Common.h" #include "BC_PDF417BarcodeValue.h" CBC_BarcodeValue::CBC_BarcodeValue() {} diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp index c1a7394103..02d9316f64 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_ResultPoint.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_PDF417BoundingBox.h" CBC_BoundingBox::CBC_BoundingBox(CBC_CommonBitMatrix* image, CBC_ResultPoint* topLeft, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp index b4e61a3f8a..c53591b211 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417Codeword.h" int32_t CBC_Codeword::BARCODE_ROW_UNKNOWN = -1; CBC_Codeword::CBC_Codeword(int32_t startX, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp index f61c523f8a..97840bf2d8 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417Common.h" #include "BC_PDF417CodewordDecoder.h" #define SYMBOL_TABLE_Length 2787 diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp index 1a3c3eb300..059229a4bf 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417Common.h" int32_t CBC_PDF417Common::NUMBER_OF_CODEWORDS = 929; int32_t CBC_PDF417Common::MAX_CODEWORDS_IN_BARCODE = NUMBER_OF_CODEWORDS - 1; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp index 261d07a0cd..f9c0afd234 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417Compaction.h" CBC_Compaction::CBC_Compaction() {} CBC_Compaction::~CBC_Compaction() {} diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp index ba822ce1d2..1628f68db7 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp @@ -24,9 +24,9 @@ #include -#include "../BC_DecoderResult.h" -#include "../barcode.h" -#include "../common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/BC_DecoderResult.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "BC_PDF417ResultMetadata.h" #include "third_party/bigint/BigIntegerLibrary.hh" diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp index 47b6794fb0..23c2aacc39 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417Codeword.h" #include "BC_PDF417BarcodeMetadata.h" #include "BC_PDF417BoundingBox.h" diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp index 9252c33011..6c1abd23da 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417Codeword.h" #include "BC_PDF417BoundingBox.h" #include "BC_PDF417DetectionResultColumn.h" diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp index 0a0067c758..5091d4e55e 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "BC_PDF417BarcodeMetadata.h" #include "BC_PDF417BoundingBox.h" #include "BC_PDF417Codeword.h" diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp index 3f0532ac4b..3732a7506d 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp @@ -20,11 +20,11 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_ResultPoint.h" -#include "../BC_BinaryBitmap.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "BC_PDF417DetectorResult.h" #include "BC_PDF417Detector.h" #define INTERGER_MAX 2147483647 diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp index 6f6b3a8cf1..00feaf0dc0 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "BC_PDF417DetectorResult.h" CBC_PDF417DetectorResult::CBC_PDF417DetectorResult(CBC_CommonBitMatrix* bits, CFX_PtrArray* points) { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp index 2746ebe703..b60f5fd28f 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417Dimensions.h" CBC_Dimensions::CBC_Dimensions(int32_t minCols, int32_t maxCols, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp index 9e0351fd35..86b9044ea9 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417Common.h" #include "BC_PDF417ECModulusPoly.h" #include "BC_PDF417ECModulusGF.h" diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp index d9952c64d1..9d31944ef8 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417Common.h" #include "BC_PDF417ECModulusPoly.h" #include "BC_PDF417ECModulusGF.h" diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp index 2e06fdb7d7..cc4976d210 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417Common.h" #include "BC_PDF417ECModulusGF.h" #include "BC_PDF417ECModulusPoly.h" diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp index b0518c6f2c..97a073fbbd 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417ErrorCorrection.h" int32_t CBC_PDF417ErrorCorrection::EC_COEFFICIENTS[][2500] = { {27, 917}, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp index 6a8beaab20..d2cee6f93f 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp @@ -22,8 +22,8 @@ #include "BC_PDF417HighLevelEncoder.h" -#include "../BC_UtilCodingConvert.h" -#include "../barcode.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417Compaction.h" #include "third_party/bigint/BigIntegerLibrary.hh" diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp index 36e9a7d793..4e0f3c962b 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "testing/gtest/include/gtest/gtest.h" -#include "../../../../core/include/fxcrt/fx_basic.h" -#include "../../../../testing/fx_string_testhelpers.h" +#include "core/include/fxcrt/fx_basic.h" +#include "testing/fx_string_testhelpers.h" #include "BC_PDF417HighLevelEncoder.h" TEST(PDF417HighLevelEncoder, EncodeHighLevel) { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp index f970d700dc..f9664e47be 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp @@ -20,16 +20,16 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Reader.h" -#include "../BC_BinaryBitmap.h" -#include "../BC_ResultPoint.h" -#include "../BC_BinaryBitmap.h" -#include "../BC_DecoderResult.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../common/BC_CommonBitArray.h" -#include "../common/BC_CommonDecoderResult.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_DecoderResult.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_PDF417DetectorResult.h" #include "BC_PDF417Detector.h" #include "BC_PDF417DetectorResult.h" diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp index 2cd5b251ac..538ae5120b 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_PDF417ResultMetadata.h" CBC_PDF417ResultMetadata::CBC_PDF417ResultMetadata() {} CBC_PDF417ResultMetadata::~CBC_PDF417ResultMetadata() {} diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp index a34213c153..2d2ea8fa8d 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_DecoderResult.h" -#include "../BC_ResultPoint.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_DecoderResult.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_PDF417Codeword.h" #include "BC_PDF417Common.h" #include "BC_PDF417BarcodeValue.h" diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp index d922889b3d..b61ba1094b 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_TwoDimWriter.h" -#include "../common/BC_CommonBitArray.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_PDF417Compaction.h" #include "BC_PDF417.h" #include "BC_PDF417BarcodeMatrix.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp index 16e8a9accd..dfc6148910 100644 --- a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "BC_QRFinderPattern.h" #include "BC_FinderPatternInfo.h" CBC_QRFinderPatternInfo::CBC_QRFinderPatternInfo(CFX_PtrArray* patternCenters) { diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp index 79066fe83e..e5bbb7d9c8 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "BC_QRAlignmentPattern.h" CBC_QRAlignmentPattern::CBC_QRAlignmentPattern(FX_FLOAT posX, FX_FLOAT posY, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp index f504517d44..a2c01c2fce 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_ResultPoint.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_QRAlignmentPattern.h" #include "BC_QRAlignmentPatternFinder.h" CBC_QRAlignmentPatternFinder::CBC_QRAlignmentPatternFinder( diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp index ad8bd566bf..5428902883 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_QRCoderVersion.h" #include "BC_QRCoderFormatInformation.h" #include "BC_QRDataMask.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp index 05635917bd..8de9ef7e80 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp @@ -20,16 +20,16 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_Reader.h" -#include "../BC_LuminanceSource.h" -#include "../BC_BufferedImageLuminanceSource.h" -#include "../BC_Binarizer.h" -#include "../BC_BinaryBitmap.h" -#include "../BC_ResultPoint.h" -#include "../common/BC_GlobalHistogramBinarizer.h" -#include "../common/BC_CommonDecoderResult.h" -#include "../common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h" +#include "xfa/src/fxbarcode/BC_Binarizer.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" #include "BC_QRCodeReader.h" #include "BC_QRCodeReader.h" #include "BC_QRCoderMode.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp index 2621abeb63..0d3096c4ae 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_TwoDimWriter.h" -#include "../BC_Reader.h" -#include "../common/BC_CommonByteMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" #include "BC_QRCodeWriter.h" #include "BC_QRCoderEncoder.h" #include "BC_QRCoder.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h index 51272f65f6..6cdd1e9c15 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h @@ -6,7 +6,7 @@ #ifndef _BC_QRCODERWRITER_H_ #define _BC_QRCODERWRITER_H_ -#include "../BC_TwoDimWriter.h" +#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" class CBC_TwoDimWriter; class CBC_MultiBarCodes; class CBC_QRCoderWriter; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp index 3569c1c2ec..9d2553d4e0 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonByteMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" #include "BC_QRCoderErrorCorrectionLevel.h" #include "BC_QRCoderMode.h" #include "BC_QRCoder.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp index 21c2f09637..825d527388 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_QRCoderBitVector.h" CBC_QRCoderBitVector::CBC_QRCoderBitVector() { m_sizeInBits = 0; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp index 7c23ce68ff..4990a157b0 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonByteArray.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteArray.h" #include "BC_QRCoderBlockPair.h" CBC_QRCoderBlockPair::CBC_QRCoderBlockPair( CBC_CommonByteArray* data, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp index 78e7a89f18..7815c99aee 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp @@ -20,11 +20,11 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../common/BC_CommonDecoderResult.h" -#include "../common/reedsolomon/BC_ReedSolomonDecoder.h" -#include "../common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" #include "BC_QRBitMatrixParser.h" #include "BC_QRDataBlock.h" #include "BC_QRDecodedBitStreamParser.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp index c3633afaa8..bfb1c6455b 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_QRCoderECB.h" CBC_QRCoderECB::CBC_QRCoderECB(int32_t count, int32_t dataCodeWords) { m_dataCodeWords = dataCodeWords; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp index 8489106d82..c5c32222f6 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_QRCoderECB.h" #include "BC_QRCoderECBlocks.h" CBC_QRCoderECBlocks::CBC_QRCoderECBlocks(int32_t ecCodeWordsPerBlock, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp index bbdaa0b93b..2610db95dc 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp @@ -20,12 +20,12 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_UtilCodingConvert.h" -#include "../common/BC_CommonByteArray.h" -#include "../common/BC_CommonByteMatrix.h" -#include "../common/reedsolomon/BC_ReedSolomon.h" -#include "../common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteArray.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" #include "BC_QRCoder.h" #include "BC_QRCoderEncoder.h" #include "BC_QRCoderMode.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp index 52265000c1..330a992361 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_QRCoderErrorCorrectionLevel.h" CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::L = NULL; CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::M = NULL; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp index 7f605c3ea5..f2fe512d43 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_QRCoderErrorCorrectionLevel.h" #include "BC_QRCoderFormatInformation.h" const int32_t CBC_QRCoderFormatInformation::FORMAT_INFO_MASK_QR = 0X5412; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp index e63f0237ef..ac1b74b5a0 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonByteMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" #include "BC_QRCoderErrorCorrectionLevel.h" #include "BC_QRCoder.h" #include "BC_QRCoderMaskUtil.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp index 3c663c7b69..8c66717d84 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonByteMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" #include "BC_QRCoderErrorCorrectionLevel.h" #include "BC_QRCoder.h" #include "BC_QRCoderMaskUtil.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp index 7481a8ec67..f122627986 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_QRCoderVersion.h" #include "BC_QRCoderMode.h" CBC_QRCoderMode* CBC_QRCoderMode::sBYTE = NULL; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp index dde09ee564..15b99fbb6a 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../utils.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/utils.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_QRCoderECB.h" #include "BC_QRCoderFormatInformation.h" #include "BC_QRCoderErrorCorrectionLevel.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp index 0a265c9d04..b4a7b53258 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "../barcode.h" +#include "xfa/src/fxbarcode/barcode.h" #include "BC_QRCoderECBlocks.h" #include "BC_QRCoderECB.h" #include "BC_QRDataBlock.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp index 79b6db39a9..f825ce4766 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_QRDataMask.h" static int32_t N_DATA_MASKS = 0; CFX_PtrArray* CBC_QRDataMask::DATA_MASKS = NULL; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp index 26180ceff4..c9a9222506 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp @@ -20,12 +20,12 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_UtilCodingConvert.h" -#include "../common/BC_CommonBitSource.h" -#include "../common/BC_CommonECI.h" -#include "../common/BC_CommonCharacterSetECI.h" -#include "../common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitSource.h" +#include "xfa/src/fxbarcode/common/BC_CommonECI.h" +#include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "BC_QRCoderMode.h" #include "BC_QRDecodedBitStreamParser.h" const FX_CHAR* CBC_QRDecodedBitStreamParser::UTF_8 = "utf8"; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp index 70edfeff40..1b799114b4 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonBitMatrix.h" -#include "../BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "BC_QRFinderPattern.h" #include "BC_QRCoderVersion.h" #include "BC_FinderPatternInfo.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp index 561c10a3ab..55656c48fd 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_ResultPoint.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_QRDetectorResult.h" CBC_QRDetectorResult::CBC_QRDetectorResult(CBC_CommonBitMatrix* bits, CFX_PtrArray* points) diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp index f9fdfbd2cf..0ff97e21b7 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "BC_QRFinderPattern.h" CBC_QRFinderPattern::CBC_QRFinderPattern(FX_FLOAT x, FX_FLOAT posY, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp index fc82584370..69614f0710 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../BC_ResultPoint.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_QRFinderPatternFinder.h" #include "BC_FinderPatternInfo.h" #include "BC_QRFinderPattern.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp index 1bc85f1a12..b06be55f7e 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "../barcode.h" -#include "../common/BC_CommonPerspectiveTransform.h" -#include "../common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "BC_QRGridSampler.h" CBC_QRGridSampler CBC_QRGridSampler::m_gridSampler; CBC_QRGridSampler::CBC_QRGridSampler() {} diff --git a/xfa/src/fxfa/src/app/xfa_checksum.cpp b/xfa/src/fxfa/src/app/xfa_checksum.cpp index 311c84111f..87c3cdbe25 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.cpp +++ b/xfa/src/fxfa/src/app/xfa_checksum.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_checksum.h" CXFA_SAXReaderHandler::CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext) : m_pContext(pContext) { diff --git a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp index d172b6b157..e5b7e8789b 100644 --- a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffConfigAcc.h" CXFA_FFConfigAcc::CXFA_FFConfigAcc(CXFA_Node* pNode) : m_pNode(pNode), m_pPsMapNode(NULL) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.cpp b/xfa/src/fxfa/src/app/xfa_ffapp.cpp index 363b5b5742..0ce79e05db 100644 --- a/xfa/src/fxfa/src/app/xfa_ffapp.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffapp.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffdochandler.h" #include "xfa_fwladapter.h" #include "xfa_ffdoc.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp index b5c60b2711..a3e842676f 100644 --- a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp index 9de1039010..778775f7c5 100644 --- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp index 81d5be5f5e..e6a4d4b0ad 100644 --- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp index f53fe63f1a..448e4cfc8e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffapp.h" #include "xfa_ffdoc.h" #include "xfa_ffdocview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.h b/xfa/src/fxfa/src/app/xfa_ffdoc.h index 4a1196ad76..1dcbd414fb 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.h +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.h @@ -7,7 +7,7 @@ #ifndef FXFA_SRC_APP_XFA_FFDOC_H_ #define FXFA_SRC_APP_XFA_FFDOC_H_ -#include "../../../../include/fxfa/fxfa.h" +#include "xfa/include/fxfa/fxfa.h" class CXFA_FFApp; class CXFA_FFNotify; diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp index 51a89479bf..502da6d14a 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffdochandler.h" #include "xfa_ffdoc.h" CXFA_FFDocHandler::CXFA_FFDocHandler() {} diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp index cb5b6afdca..f85ba65855 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffdocview.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp index b21c25fa93..a241b18d1c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffdraw.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp index cdb9421b1c..0d57e4a613 100644 --- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffexclgroup.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_fffield.cpp b/xfa/src/fxfa/src/app/xfa_fffield.cpp index 45d8d69c8c..b9c7f7a751 100644 --- a/xfa/src/fxfa/src/app/xfa_fffield.cpp +++ b/xfa/src/fxfa/src/app/xfa_fffield.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.cpp b/xfa/src/fxfa/src/app/xfa_ffimage.cpp index 65ad5ae46b..3b6396b224 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimage.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimage.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffdraw.h" #include "xfa_ffimage.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp index 890169621a..01088354ac 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp index b2aef0be80..9c7875cd3c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffdocview.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp index 0780ab7e0f..87fe5cd1b4 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffpageview.h" #include "xfa_ffwidget.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.cpp b/xfa/src/fxfa/src/app/xfa_ffpath.cpp index 6b021b4642..965f9cbe9e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpath.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpath.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffdraw.h" #include "xfa_ffpath.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp index 8efa450865..47ad803944 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffwidgetacc.h" #include "xfa_fffield.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp index 7b5930d1e4..b810292a89 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp index a435d5a0ec..b4c2e06e1e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffsubform.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_fftext.cpp b/xfa/src/fxfa/src/app/xfa_fftext.cpp index 0f3cea3647..a4dc78eb00 100644 --- a/xfa/src/fxfa/src/app/xfa_fftext.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftext.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffdraw.h" #include "xfa_fftext.h" diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp index 3ba8072ee6..f90a2ccaba 100644 --- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp index 0c37dc5f68..58047302e0 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffapp.h" #include "xfa_ffdoc.h" #include "xfa_ffdocview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.h b/xfa/src/fxfa/src/app/xfa_ffwidget.h index 500a23f035..20a7d80443 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.h @@ -7,7 +7,7 @@ #ifndef _FXFA_FORMFILLER_WIDGET_IMP_H #define _FXFA_FORMFILLER_WIDGET_IMP_H -#include "../../../../include/fxfa/fxfa.h" +#include "xfa/include/fxfa/fxfa.h" class CXFA_FFPageView; class CXFA_FFDocView; diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp index 285ea544ac..92b6fe920c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffdoc.h" #include "xfa_ffdocview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp index 1c439788b7..6af98a6456 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffwidgethandler.h" #include "xfa_ffwidget.h" diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp index 015ff1f476..d6a5677e85 100644 --- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp +++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fontmgr.h" #include "xfa_ffdoc.h" #include "xfa_ffConfigAcc.h" diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp index 077fa648f3..4382d0bbf3 100644 --- a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp index cbf81ad46c..1aa6242b4d 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwltheme.h" #include "xfa_ffwidget.h" #include "xfa_ffapp.h" diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp index 0ebda0ccc8..2d8ed0dd02 100644 --- a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp +++ b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_rendercontext.h" #include "xfa_ffwidget.h" #define XFA_RENDERCONTEXT_MaxCount 30 diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/src/app/xfa_textlayout.cpp index e620924441..45eac17884 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp +++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_textlayout.h" #include "xfa_ffapp.h" #include "xfa_ffdoc.h" diff --git a/xfa/src/fxfa/src/common/xfa_common.h b/xfa/src/fxfa/src/common/xfa_common.h index b7bafa7505..42201cc148 100644 --- a/xfa/src/fxfa/src/common/xfa_common.h +++ b/xfa/src/fxfa/src/common/xfa_common.h @@ -4,6 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +// TODO(thestig): Remove this file and do IWYU. + #ifndef _XFA_COMMON_H_ #define _XFA_COMMON_H_ #include "xfa_utils.h" @@ -13,7 +15,6 @@ #include "xfa_script.h" #include "xfa_docdata.h" #include "xfa_doclayout.h" -#include "xfa_debug.h" #include "xfa_localemgr.h" #include "xfa_fm2jsapi.h" #endif diff --git a/xfa/src/fxfa/src/common/xfa_debug.h b/xfa/src/fxfa/src/common/xfa_debug.h deleted file mode 100644 index dee70a688e..0000000000 --- a/xfa/src/fxfa/src/common/xfa_debug.h +++ /dev/null @@ -1,9 +0,0 @@ -// 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 _XFA_COMMON_DEBUG_H_ -#define _XFA_COMMON_DEBUG_H_ -#endif diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2js.cpp b/xfa/src/fxfa/src/fm2js/xfa_fm2js.cpp deleted file mode 100644 index 3cf1330277..0000000000 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2js.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// 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 - -#include "xfa_fm2js.h" diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h index 68dae71810..6bf7bbb063 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h @@ -6,17 +6,16 @@ #ifndef _XFA_FM2JS_H #define _XFA_FM2JS_H -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #define RUNTIMEFUNCTIONRETURNVALUE \ (FX_WSTRC(L"foxit_xfa_formcalc_runtime_func_return_value")) #define EXCLAMATION_IN_IDENTIFIER \ diff --git a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp index 99b02b8b79..e55cf7335c 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_basic_imp.h" #include "xfa_script_datawindow.h" #include "xfa_script_eventpseudomodel.h" diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp index 0b5f63efa6..fbd0d95dcb 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_basic_imp.h" extern const XFA_PACKETINFO g_XFAPacketData[]; extern const int32_t g_iXFAPacketCount; diff --git a/xfa/src/fxfa/src/parser/xfa_debug_parser.cpp b/xfa/src/fxfa/src/parser/xfa_debug_parser.cpp deleted file mode 100644 index 4f5365e1d8..0000000000 --- a/xfa/src/fxfa/src/parser/xfa_debug_parser.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// 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 - -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" diff --git a/xfa/src/fxfa/src/parser/xfa_debug_parser.h b/xfa/src/fxfa/src/parser/xfa_debug_parser.h deleted file mode 100644 index 90dce89d3e..0000000000 --- a/xfa/src/fxfa/src/parser/xfa_debug_parser.h +++ /dev/null @@ -1,9 +0,0 @@ -// 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 _XFA_DEBUG_PARSER_H_ -#define _XFA_DEBUG_PARSER_H_ -#endif diff --git a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp index 5e2b31a723..7f0de75619 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #define XFA_HASHCODE_Group 0xf7f75fcd class CXFA_TraverseStrategy_DDGroup { public: diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp index 93ec1da24e..baab5eb02c 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp @@ -4,20 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_basic_imp.h" -#include "xfa_document_imp.h" #include "xfa_document_datadescription_imp.h" #include "xfa_document_datamerger_imp.h" #include "xfa_document_layout_imp.h" diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp index 644a29bb2b..d5067cdacf 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_basic_imp.h" #include "xfa_document_layout_imp.h" #include "xfa_script_datawindow.h" diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.h b/xfa/src/fxfa/src/parser/xfa_document_imp.h deleted file mode 100644 index 53404c0d9e..0000000000 --- a/xfa/src/fxfa/src/parser/xfa_document_imp.h +++ /dev/null @@ -1,9 +0,0 @@ -// 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 _XFA_DOCUMENT_IMP_H_ -#define _XFA_DOCUMENT_IMP_H_ -#endif diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp index 4d678bf75d..861ff1f67b 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp @@ -4,20 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_basic_imp.h" -#include "xfa_document_imp.h" #include "xfa_document_layout_imp.h" #include "xfa_document_datamerger_imp.h" #include "xfa_layout_itemlayout.h" diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp index 558765270a..c381aa9e97 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_document_serialize.h" IXFA_PacketImport* IXFA_PacketImport::Create(CXFA_Document* pDocument) { return new CXFA_DataImporter(pDocument); diff --git a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp index e98795b5c9..562beb9001 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_document_layout_imp.h" #include "xfa_layout_itemlayout.h" #include "xfa_layout_pagemgr_new.h" diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp index 1f24c565b1..7d12a289e8 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_document_layout_imp.h" #include "xfa_layout_itemlayout.h" #include "xfa_layout_pagemgr_new.h" diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp index f83b772003..aedd090371 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_document_datamerger_imp.h" #include "xfa_document_layout_imp.h" #include "xfa_layout_itemlayout.h" diff --git a/xfa/src/fxfa/src/parser/xfa_locale.cpp b/xfa/src/fxfa/src/parser/xfa_locale.cpp index 50157aa83f..bfadefcf4c 100644 --- a/xfa/src/fxfa/src/parser/xfa_locale.cpp +++ b/xfa/src/fxfa/src/parser/xfa_locale.cpp @@ -4,19 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../../core/include/fxcrt/fx_xml.h" -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "core/include/fxcrt/fx_xml.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_locale.h" static const FX_WCHAR* g_FX_Percent = L"z,zzz,zzz,zzz,zzz,zzz%"; diff --git a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp index 62310f5845..f4b20668ee 100644 --- a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp @@ -4,19 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../../core/include/fxcrt/fx_xml.h" -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "core/include/fxcrt/fx_xml.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_locale.h" const uint8_t g_enUS_Locale[] = { diff --git a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp index 93c371d996..24731b0668 100644 --- a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" static const FX_DOUBLE fraction_scales[] = {0.1, 0.01, 0.001, diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index 9f77d7e75a..be2bed9334 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_basic_imp.h" #include "xfa_document_layout_imp.h" CXFA_Object::CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags) diff --git a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp index 86276483b6..6eb0adf647 100644 --- a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" static FX_ARGB XFA_WStringToColor(const CFX_WideStringC& wsValue) { uint8_t r = 0, g = 0, b = 0; if (wsValue.GetLength() == 0) { diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp index 937d6fa2ce..6064c0158f 100644 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_basic_imp.h" #include "xfa_parser_imp.h" IXFA_Parser* IXFA_Parser::Create(IXFA_ObjFactory* pFactory, diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp index e0f4fee342..80258b45aa 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_datawindow.h" CScript_DataWindow::CScript_DataWindow(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_DataWindow) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp index 479c2592bd..74786ad75c 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_eventpseudomodel.h" CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_EventPseudoModel) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp index 21a4fa1997..bf79220ccb 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_hostpseudomodel.h" CScript_HostPseudoModel::CScript_HostPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_HostPseudoModel) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp index d35c48f1a9..9f4f0232ef 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_imp.h" #include "xfa_script_resolveprocessor.h" #include "xfa_script_nodehelper.h" diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp index da4ad54017..0b344129dc 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_layoutpseudomodel.h" #include "xfa_document_layout_imp.h" #include "xfa_layout_appadapter.h" diff --git a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp index bdb8c0b309..910d148f57 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_logpseudomodel.h" CScript_LogPseudoModel::CScript_LogPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LogPseudoModel) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp index 44eb698a54..96ceeb5318 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_nodehelper.h" #include "xfa_script_imp.h" CXFA_NodeHelper::CXFA_NodeHelper(void) diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp index befff73141..9645a9d2c2 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_resolveprocessor.h" #include "xfa_script_nodehelper.h" #include "xfa_script_imp.h" diff --git a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp index f5ca9e2a19..53fb24dee1 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_signaturepseudomodel.h" CScript_SignaturePseudoModel::CScript_SignaturePseudoModel( CXFA_Document* pDocument) diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp index abe5fdbd48..3e4bc303e1 100644 --- a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" CXFA_Node* XFA_CreateUIChild(CXFA_Node* pNode, XFA_ELEMENT& eWidgetType) { XFA_ELEMENT eType = pNode->GetClassID(); eWidgetType = eType; diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp b/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp index 174673eb72..81fdc4e322 100644 --- a/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp +++ b/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "../../../testing/gtest/include/gtest/gtest.h" -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" TEST(XfaUtilsImp, XFA_MapRotation) { struct TestCase { diff --git a/xfa/src/fxgraphics/src/fx_metafile_interpreter.cpp b/xfa/src/fxgraphics/src/fx_metafile_interpreter.cpp deleted file mode 100644 index 451df08ca6..0000000000 --- a/xfa/src/fxgraphics/src/fx_metafile_interpreter.cpp +++ /dev/null @@ -1,257 +0,0 @@ -// 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 - -#include "pre.h" -#include "../include/fx_graphics.h" -#include "fx_metafile_interpreter.h" -CFX_MetafileInterpreter::CFX_MetafileInterpreter() { - _element = NULL; -} -CFX_MetafileInterpreter::~CFX_MetafileInterpreter() { - _element = NULL; -} -FX_BOOL CFX_MetafileInterpreter::SetCurrentElement(CXML_Element* element) { - _FX_RETURN_VALUE_IF_FAIL(element, FALSE); - _element = element; - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetLineCap(int32_t& lineCap) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* lineCapElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(lineCapElement, FALSE); - lineCap = lineCapElement->GetAttrInteger("CFX_GraphStateData::LineCap"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetLineDash(FX_FLOAT& dashPhase, - int32_t& dashArray, - int32_t& dashCount) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* dashPhaseElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(dashPhaseElement, FALSE); - dashPhase = dashPhaseElement->GetAttrFloat("FX_FLOAT"); - CXML_Element* dashArrayElement = _element->GetElement(1); - _FX_RETURN_VALUE_IF_FAIL(dashArrayElement, FALSE); - dashArray = dashArrayElement->GetAttrInteger("FX_FLOAT *"); - CXML_Element* dashCountElement = _element->GetElement(2); - _FX_RETURN_VALUE_IF_FAIL(dashCountElement, FALSE); - dashCount = dashCountElement->GetAttrInteger("int32_t"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetLineDash(int32_t& dashStyle) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* dashStyleElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(dashStyleElement, FALSE); - dashStyle = dashStyleElement->GetAttrInteger("FX_DashStyle"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetLineJoin(int32_t& lineJoin) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* lineJoinElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(lineJoinElement, FALSE); - lineJoin = lineJoinElement->GetAttrInteger("CFX_GraphStateData::LineJoin"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetMiterLimit(FX_FLOAT& miterLimit) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* miterLimitElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(miterLimitElement, FALSE); - miterLimit = miterLimitElement->GetAttrFloat("FX_FLOAT"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetLineWidth(FX_FLOAT& lineWidth, - int32_t& isActOnDash) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* lineWidthElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(lineWidthElement, FALSE); - lineWidth = lineWidthElement->GetAttrFloat("FX_FLOAT"); - CXML_Element* isActOnDashElement = _element->GetElement(1); - _FX_RETURN_VALUE_IF_FAIL(isActOnDashElement, FALSE); - isActOnDash = isActOnDashElement->GetAttrInteger("FX_BOOL"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetStrokeColor(int32_t& color) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* colorElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(colorElement, FALSE); - color = colorElement->GetAttrInteger("CFX_Color *"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetFillColor(int32_t& color) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* colorElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(colorElement, FALSE); - color = colorElement->GetAttrInteger("CFX_Color *"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_StrokePath(int32_t& path, - int32_t& matrix) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* pathElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(pathElement, FALSE); - path = pathElement->GetAttrInteger("CFX_Path *"); - CXML_Element* matrixElement = _element->GetElement(1); - _FX_RETURN_VALUE_IF_FAIL(matrixElement, FALSE); - matrix = matrixElement->GetAttrInteger("CFX_Matrix *"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_FillPath(int32_t& path, - int32_t& fillMode, - int32_t& matrix) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* pathElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(pathElement, FALSE); - path = pathElement->GetAttrInteger("CFX_Path *"); - CXML_Element* fillModeElement = _element->GetElement(1); - _FX_RETURN_VALUE_IF_FAIL(fillModeElement, FALSE); - fillMode = fillModeElement->GetAttrInteger("FX_FillMode"); - CXML_Element* matrixElement = _element->GetElement(2); - _FX_RETURN_VALUE_IF_FAIL(matrixElement, FALSE); - matrix = matrixElement->GetAttrInteger("CFX_Matrix *"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_ClipPath(int32_t& path, - int32_t& fillMode, - int32_t& matrix) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* pathElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(pathElement, FALSE); - path = pathElement->GetAttrInteger("CFX_Path *"); - CXML_Element* fillModeElement = _element->GetElement(1); - _FX_RETURN_VALUE_IF_FAIL(fillModeElement, FALSE); - fillMode = fillModeElement->GetAttrInteger("FX_FillMode"); - CXML_Element* matrixElement = _element->GetElement(2); - _FX_RETURN_VALUE_IF_FAIL(matrixElement, FALSE); - matrix = matrixElement->GetAttrInteger("CFX_Matrix *"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_DrawImage(int32_t& source, - int32_t& point, - int32_t& matrix) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* sourceElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(sourceElement, FALSE); - source = sourceElement->GetAttrInteger("CFX_DIBSource *"); - CXML_Element* pointElement = _element->GetElement(1); - _FX_RETURN_VALUE_IF_FAIL(pointElement, FALSE); - point = pointElement->GetAttrInteger("CFX_PointF *"); - CXML_Element* matrixElement = _element->GetElement(2); - _FX_RETURN_VALUE_IF_FAIL(matrixElement, FALSE); - matrix = matrixElement->GetAttrInteger("CFX_Matrix *"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_StretchImage(int32_t& source, - int32_t& rect, - int32_t& matrix) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* sourceElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(sourceElement, FALSE); - source = sourceElement->GetAttrInteger("CFX_DIBSource *"); - CXML_Element* rectElement = _element->GetElement(1); - _FX_RETURN_VALUE_IF_FAIL(rectElement, FALSE); - rect = rectElement->GetAttrInteger("CFX_RectF *"); - CXML_Element* matrixElement = _element->GetElement(2); - _FX_RETURN_VALUE_IF_FAIL(matrixElement, FALSE); - matrix = matrixElement->GetAttrInteger("CFX_Matrix *"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_ConcatMatrix(int32_t& matrix) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* matrixElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(matrixElement, FALSE); - matrix = matrixElement->GetAttrInteger("CFX_Matrix *"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetClipRect(int32_t& rect) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* rectElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(rectElement, FALSE); - rect = rectElement->GetAttrInteger("CFX_RectF *"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetFont(int32_t& font) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* fontElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(fontElement, FALSE); - font = fontElement->GetAttrInteger("CFX_Font *"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetFontSize(FX_FLOAT& size) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* sizeElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(sizeElement, FALSE); - size = sizeElement->GetAttrFloat("FX_FLOAT"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetFontHScale(FX_FLOAT& scale) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* scaleElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(scaleElement, FALSE); - scale = scaleElement->GetAttrFloat("FX_FLOAT"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetCharSpacing(FX_FLOAT& spacing) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* spacingElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(spacingElement, FALSE); - spacing = spacingElement->GetAttrFloat("FX_FLOAT"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetTextDrawingMode(int32_t& mode) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* modeElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(modeElement, FALSE); - mode = modeElement->GetAttrInteger("int32_t"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_SetText(int32_t& point, - int32_t& text, - int32_t& matrix) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* pointElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(pointElement, FALSE); - point = pointElement->GetAttrInteger("CFX_PointF *"); - CXML_Element* textElement = _element->GetElement(1); - _FX_RETURN_VALUE_IF_FAIL(textElement, FALSE); - text = textElement->GetAttrInteger("CFX_WideString *"); - CXML_Element* matrixElement = _element->GetElement(2); - _FX_RETURN_VALUE_IF_FAIL(matrixElement, FALSE); - matrix = matrixElement->GetAttrInteger("CFX_Matrix *"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_Transfer(int32_t& graphics, - int32_t& matrix) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* graphicsElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(graphicsElement, FALSE); - graphics = graphicsElement->GetAttrInteger("CFX_Graphics *"); - CXML_Element* matrixElement = _element->GetElement(1); - _FX_RETURN_VALUE_IF_FAIL(matrixElement, FALSE); - matrix = matrixElement->GetAttrInteger("CFX_Matrix *"); - return TRUE; -} -FX_BOOL CFX_MetafileInterpreter::ParamOf_Transfer(int32_t& graphics, - FX_FLOAT& srcLeft, - FX_FLOAT& srcTop, - int32_t& dstRect, - int32_t& matrix) { - _FX_RETURN_VALUE_IF_FAIL(_element, FALSE); - CXML_Element* graphicsElement = _element->GetElement(0); - _FX_RETURN_VALUE_IF_FAIL(graphicsElement, FALSE); - graphics = graphicsElement->GetAttrInteger("CFX_Graphics *"); - CXML_Element* srcLeftElement = _element->GetElement(2); - _FX_RETURN_VALUE_IF_FAIL(srcLeftElement, FALSE); - srcLeft = srcLeftElement->GetAttrFloat("FX_FLOAT"); - CXML_Element* srcTopElement = _element->GetElement(3); - _FX_RETURN_VALUE_IF_FAIL(srcTopElement, FALSE); - srcTop = srcTopElement->GetAttrFloat("FX_FLOAT"); - CXML_Element* dstRectElement = _element->GetElement(1); - _FX_RETURN_VALUE_IF_FAIL(dstRectElement, FALSE); - dstRect = dstRectElement->GetAttrInteger("CFX_RectF *"); - CXML_Element* matrixElement = _element->GetElement(4); - _FX_RETURN_VALUE_IF_FAIL(matrixElement, FALSE); - matrix = matrixElement->GetAttrInteger("CFX_Matrix *"); - return TRUE; -} diff --git a/xfa/src/fxgraphics/src/fx_metafile_interpreter.h b/xfa/src/fxgraphics/src/fx_metafile_interpreter.h deleted file mode 100644 index 713cf0c5d8..0000000000 --- a/xfa/src/fxgraphics/src/fx_metafile_interpreter.h +++ /dev/null @@ -1,53 +0,0 @@ -// 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 __H_FX_METAFILE_INTERPRETER__ -#define __H_FX_METAFILE_INTERPRETER__ -class CFX_MetafileInterpreter { - public: - CFX_MetafileInterpreter(); - virtual ~CFX_MetafileInterpreter(); - - FX_BOOL SetCurrentElement(CXML_Element* element); - - FX_BOOL ParamOf_SetLineCap(int32_t& lineCap); - FX_BOOL ParamOf_SetLineDash(FX_FLOAT& dashPhase, - int32_t& dashArray, - int32_t& dashCount); - FX_BOOL ParamOf_SetLineDash(int32_t& dashStyle); - FX_BOOL ParamOf_SetLineJoin(int32_t& lineJoin); - FX_BOOL ParamOf_SetMiterLimit(FX_FLOAT& miterLimit); - FX_BOOL ParamOf_SetLineWidth(FX_FLOAT& lineWidth, int32_t& isActOnDash); - - FX_BOOL ParamOf_SetStrokeColor(int32_t& color); - FX_BOOL ParamOf_SetFillColor(int32_t& color); - - FX_BOOL ParamOf_StrokePath(int32_t& path, int32_t& matrix); - FX_BOOL ParamOf_FillPath(int32_t& path, int32_t& fillMode, int32_t& matrix); - FX_BOOL ParamOf_ClipPath(int32_t& path, int32_t& fillMode, int32_t& matrix); - - FX_BOOL ParamOf_DrawImage(int32_t& source, int32_t& point, int32_t& matrix); - FX_BOOL ParamOf_StretchImage(int32_t& source, int32_t& rect, int32_t& matrix); - - FX_BOOL ParamOf_ConcatMatrix(int32_t& matrix); - FX_BOOL ParamOf_SetClipRect(int32_t& rect); - FX_BOOL ParamOf_SetFont(int32_t& font); - FX_BOOL ParamOf_SetFontSize(FX_FLOAT& size); - FX_BOOL ParamOf_SetFontHScale(FX_FLOAT& scale); - FX_BOOL ParamOf_SetCharSpacing(FX_FLOAT& spacing); - FX_BOOL ParamOf_SetTextDrawingMode(int32_t& mode); - FX_BOOL ParamOf_SetText(int32_t& point, int32_t& text, int32_t& matrix); - FX_BOOL ParamOf_Transfer(int32_t& graphics, int32_t& matrix); - FX_BOOL ParamOf_Transfer(int32_t& graphics, - FX_FLOAT& srcLeft, - FX_FLOAT& srcTop, - int32_t& dstRect, - int32_t& matrix); - - private: - CXML_Element* _element; -}; -#endif diff --git a/xfa/src/fxgraphics/src/fx_path_generator.h b/xfa/src/fxgraphics/src/fx_path_generator.h index 663087d4c3..601f562fdc 100644 --- a/xfa/src/fxgraphics/src/fx_path_generator.h +++ b/xfa/src/fxgraphics/src/fx_path_generator.h @@ -7,7 +7,7 @@ #ifndef __H_FX_PATH_GENERATOR__ #define __H_FX_PATH_GENERATOR__ -#include "../../../../core/include/fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" class CFX_PathGenerator { public: diff --git a/xfa/src/fxgraphics/src/pre.h b/xfa/src/fxgraphics/src/pre.h index 6556c87e32..53b325501d 100644 --- a/xfa/src/fxgraphics/src/pre.h +++ b/xfa/src/fxgraphics/src/pre.h @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../foxitlib.h" +#include "xfa/src/foxitlib.h" #ifndef FXSYS_Mul #define FXSYS_Mul(a, b) ((a) * (b)) #define FXSYS_Div(a, b) ((a) / (b)) diff --git a/xfa/src/fxjse/src/class.cpp b/xfa/src/fxjse/src/class.cpp index a4dc922cf2..3b801a8a89 100644 --- a/xfa/src/fxjse/src/class.cpp +++ b/xfa/src/fxjse/src/class.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fxv8.h" #include "context.h" #include "class.h" diff --git a/xfa/src/fxjse/src/context.cpp b/xfa/src/fxjse/src/context.cpp index de5e4d5873..e3f5b93e3c 100644 --- a/xfa/src/fxjse/src/context.cpp +++ b/xfa/src/fxjse/src/context.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fxv8.h" #include "context.h" #include "class.h" diff --git a/xfa/src/fxjse/src/dynprop.cpp b/xfa/src/fxjse/src/dynprop.cpp index 413a431cae..37c59f9ede 100644 --- a/xfa/src/fxjse/src/dynprop.cpp +++ b/xfa/src/fxjse/src/dynprop.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fxv8.h" #include "class.h" #include "value.h" diff --git a/xfa/src/fxjse/src/runtime.cpp b/xfa/src/fxjse/src/runtime.cpp index 6fc2185de1..b1630dcd11 100644 --- a/xfa/src/fxjse/src/runtime.cpp +++ b/xfa/src/fxjse/src/runtime.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../fpdfsdk/include/jsapi/fxjs_v8.h" // For per-isolate data. -#include "../../foxitlib.h" +#include "fpdfsdk/include/jsapi/fxjs_v8.h" // For per-isolate data. +#include "xfa/src/foxitlib.h" #include "fxv8.h" #include "runtime.h" #include "scope_inline.h" diff --git a/xfa/src/fxjse/src/value.cpp b/xfa/src/fxjse/src/value.cpp index a6d01843e1..a482fb04b2 100644 --- a/xfa/src/fxjse/src/value.cpp +++ b/xfa/src/fxjse/src/value.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../foxitlib.h" +#include "xfa/src/foxitlib.h" #include "fxv8.h" #include "value.h" #include "class.h" -- cgit v1.2.3