From 3ebd121d45ceb08918a3dcb5b3b7ac29448c862f Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 9 Mar 2016 09:59:23 -0500 Subject: Review and cleanup lint warnings. This CL goes through the remaining list of list warnings and records why they are currently blacklisted, or fixes and enables them. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1773733002 . --- xfa/src/fxbarcode/qrcode/BC_QRCoder.h | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h | 2 +- xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h | 6 +++--- xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h | 18 +++++++++--------- xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h | 2 +- xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h | 2 +- xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h | 8 ++++---- 7 files changed, 20 insertions(+), 20 deletions(-) (limited to 'xfa/src/fxbarcode/qrcode') diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoder.h index e7087b33d7..6a44b53a6d 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.h +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.h @@ -25,7 +25,7 @@ class CBC_QRCoder { CBC_CommonByteMatrix* m_matrix; public: - const static int32_t NUM_MASK_PATTERNS; + static const int32_t NUM_MASK_PATTERNS; CBC_QRCoder(); virtual ~CBC_QRCoder(); CBC_QRCoderMode* GetMode(); diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h index 70dad949c6..f1b6504b2f 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h @@ -19,7 +19,7 @@ class CBC_CommonByteMatrix; class CBC_QRCoderEncoder { private: - const static int32_t m_alphaNumbericTable[96]; + static const int32_t m_alphaNumbericTable[96]; public: CBC_QRCoderEncoder(); diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h index 4d6402a20b..61870d788d 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h @@ -10,9 +10,9 @@ class CBC_QRCoderErrorCorrectionLevel; class CBC_QRCoderFormatInformation { private: - const static int32_t FORMAT_INFO_MASK_QR; - const static int32_t FORMAT_INFO_DECODE_LOOKUP[32][2]; - const static int32_t BITS_SET_IN_HALF_BYTE[16]; + static const int32_t FORMAT_INFO_MASK_QR; + static const int32_t FORMAT_INFO_DECODE_LOOKUP[32][2]; + static const int32_t BITS_SET_IN_HALF_BYTE[16]; CBC_QRCoderErrorCorrectionLevel* m_errorCorrectLevl; uint8_t m_dataMask; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h index be38c8a4ff..6676b8389d 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h @@ -12,15 +12,15 @@ class CBC_QRCoderErrorCorrectionLevel; class CBC_QRCoderBitVector; class CBC_QRCoderMatrixUtil { private: - const static int32_t POSITION_DETECTION_PATTERN[7][7]; - const static int32_t VERTICAL_SEPARATION_PATTERN[7][1]; - const static int32_t HORIZONTAL_SEPARATION_PATTERN[1][8]; - const static int32_t POSITION_ADJUSTMENT_PATTERN[5][5]; - const static int32_t POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE[40][7]; - const static int32_t TYPE_INFO_COORDINATES[15][2]; - const static int32_t VERSION_INFO_POLY; - const static int32_t TYPE_INFO_POLY; - const static int32_t TYPE_INFO_MASK_PATTERN; + static const int32_t POSITION_DETECTION_PATTERN[7][7]; + static const int32_t VERTICAL_SEPARATION_PATTERN[7][1]; + static const int32_t HORIZONTAL_SEPARATION_PATTERN[1][8]; + static const int32_t POSITION_ADJUSTMENT_PATTERN[5][5]; + static const int32_t POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE[40][7]; + static const int32_t TYPE_INFO_COORDINATES[15][2]; + static const int32_t VERSION_INFO_POLY; + static const int32_t TYPE_INFO_POLY; + static const int32_t TYPE_INFO_MASK_PATTERN; public: CBC_QRCoderMatrixUtil(); diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h index 755a7345dc..ceb6f91930 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h @@ -15,7 +15,7 @@ class CBC_QRCoderErrorCorrectionLevel; class CBC_QRCoderVersion { private: - const static int32_t VERSION_DECODE_INFO[34]; + static const int32_t VERSION_DECODE_INFO[34]; static CFX_PtrArray* VERSION; int32_t m_versionNumber; int32_t m_totalCodeWords; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h index c014e4dec7..ca64ab0fb0 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h +++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h @@ -14,7 +14,7 @@ class CBC_QRCoderVersion; class CBC_CommonCharacterSetECI; class CBC_QRDecodedBitStreamParser { private: - const static FX_CHAR ALPHANUMERIC_CHARS[45]; + static const FX_CHAR ALPHANUMERIC_CHARS[45]; static const FX_CHAR* UTF_8; CBC_QRDecodedBitStreamParser(); diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h index aa731b6cdb..b7640491f0 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h @@ -16,10 +16,10 @@ class CBC_QRFinderPatternInfo; class CBC_QRFinderPatternFinder { private: - const static int32_t CENTER_QUORUM; - const static int32_t MIN_SKIP; - const static int32_t MAX_MODULES; - const static int32_t INTEGER_MATH_SHIFT; + static const int32_t CENTER_QUORUM; + static const int32_t MIN_SKIP; + static const int32_t MAX_MODULES; + static const int32_t INTEGER_MATH_SHIFT; FX_BOOL m_hasSkipped; CBC_CommonBitMatrix* m_image; CFX_Int32Array m_crossCheckStateCount; -- cgit v1.2.3