From 29b8ad0b130ec6ed4f72ebd0c0a4f9e6a5b03467 Mon Sep 17 00:00:00 2001 From: weili Date: Tue, 14 Jun 2016 18:20:04 -0700 Subject: Make code compile with clang_use_chrome_plugin (part III) This change contains files in xfa/fxbarcode directory. This is part of the efforts to make PDFium code compilable by Clang chromium style plugins. The changes are mainly the following: -- move inline constructor/destructor of complex class/struct out-of-line; -- add constructor/destructor of complex class/struct if not explicitly defined; -- add explicit out-of-line copy constructor when needed; -- move inline virtual functions out-of-line; -- Properly mark virtual functions with 'override'; -- some minor cleanups; BUG=pdfium:469 Review-Url: https://codereview.chromium.org/2067903002 --- xfa/fxbarcode/oned/BC_OnedCode39Writer.h | 34 ++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'xfa/fxbarcode/oned/BC_OnedCode39Writer.h') diff --git a/xfa/fxbarcode/oned/BC_OnedCode39Writer.h b/xfa/fxbarcode/oned/BC_OnedCode39Writer.h index f2c340b3fb..7dc314f968 100644 --- a/xfa/fxbarcode/oned/BC_OnedCode39Writer.h +++ b/xfa/fxbarcode/oned/BC_OnedCode39Writer.h @@ -14,37 +14,41 @@ class CBC_OnedCode39Writer : public CBC_OneDimWriter { public: CBC_OnedCode39Writer(); explicit CBC_OnedCode39Writer(FX_BOOL extendedMode); - virtual ~CBC_OnedCode39Writer(); + ~CBC_OnedCode39Writer() override; + // CBC_OneDimWriter uint8_t* Encode(const CFX_ByteString& contents, BCFORMAT format, int32_t& outWidth, int32_t& outHeight, - int32_t& e); + int32_t& e) override; uint8_t* Encode(const CFX_ByteString& contents, BCFORMAT format, int32_t& outWidth, int32_t& outHeight, int32_t hints, - int32_t& e); + int32_t& e) override; uint8_t* Encode(const CFX_ByteString& contents, int32_t& outLength, - int32_t& e); + int32_t& e) override; void RenderResult(const CFX_WideStringC& contents, uint8_t* code, int32_t codeLength, FX_BOOL isDevice, - int32_t& e); - - CFX_WideString encodedContents(const CFX_WideStringC& contents, int32_t& e); - FX_BOOL CheckContentValidity(const CFX_WideStringC& contents); - FX_BOOL CheckExtendedContentValidity(const CFX_WideStringC& contents); - CFX_WideString FilterContents(const CFX_WideStringC& contents); - CFX_WideString FilterExtendedContents(const CFX_WideStringC& contents); - CFX_WideString RenderTextContents(const CFX_WideStringC& contents); - CFX_WideString RenderExtendedTextContents(const CFX_WideStringC& contents); - FX_BOOL SetTextLocation(BC_TEXT_LOC loction); - FX_BOOL SetWideNarrowRatio(int32_t ratio); + int32_t& e) override; + FX_BOOL CheckContentValidity(const CFX_WideStringC& contents) override; + CFX_WideString FilterContents(const CFX_WideStringC& contents) override; + CFX_WideString RenderTextContents(const CFX_WideStringC& contents) override; + + virtual CFX_WideString encodedContents(const CFX_WideStringC& contents, + int32_t& e); + virtual FX_BOOL CheckExtendedContentValidity(const CFX_WideStringC& contents); + virtual CFX_WideString FilterExtendedContents( + const CFX_WideStringC& contents); + virtual CFX_WideString RenderExtendedTextContents( + const CFX_WideStringC& contents); + virtual FX_BOOL SetTextLocation(BC_TEXT_LOC loction); + virtual FX_BOOL SetWideNarrowRatio(int32_t ratio); private: void ToIntArray(int32_t a, int32_t* toReturn); -- cgit v1.2.3