From 275e260a6cd4a8e506ba974feb85ebcd926c1739 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Mon, 18 Sep 2017 14:23:18 -0400 Subject: Convert string class names Automated using git grep & sed. Replace StringC classes with StringView classes. Remove the CFX_ prefix and put string classes in fxcrt namespace. Change AsStringC() to AsStringView(). Rename tests from TEST(fxcrt, *String*Foo) to TEST(*String*, Foo). Couple of tests needed to have their names regularlized. BUG=pdfium:894 Change-Id: I7ca038685c8d803795f3ed02545124f7a224c83d Reviewed-on: https://pdfium-review.googlesource.com/14151 Reviewed-by: Tom Sepez Commit-Queue: Ryan Harrison --- fxbarcode/datamatrix/BC_C40Encoder.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'fxbarcode/datamatrix/BC_C40Encoder.h') diff --git a/fxbarcode/datamatrix/BC_C40Encoder.h b/fxbarcode/datamatrix/BC_C40Encoder.h index 550d226efb..5ddad92009 100644 --- a/fxbarcode/datamatrix/BC_C40Encoder.h +++ b/fxbarcode/datamatrix/BC_C40Encoder.h @@ -7,10 +7,9 @@ #ifndef FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_ #define FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_ +#include "core/fxcrt/widestring.h" #include "fxbarcode/datamatrix/BC_Encoder.h" -class CFX_WideString; - class CBC_C40Encoder : public CBC_Encoder { public: CBC_C40Encoder(); @@ -20,13 +19,12 @@ class CBC_C40Encoder : public CBC_Encoder { int32_t getEncodingMode() override; void Encode(CBC_EncoderContext& context, int32_t& e) override; - static void writeNextTriplet(CBC_EncoderContext& context, - CFX_WideString& buffer); + static void writeNextTriplet(CBC_EncoderContext& context, WideString& buffer); virtual void handleEOD(CBC_EncoderContext& context, - CFX_WideString& buffer, + WideString& buffer, int32_t& e); - virtual int32_t encodeChar(wchar_t c, CFX_WideString& sb, int32_t& e); + virtual int32_t encodeChar(wchar_t c, WideString& sb, int32_t& e); private: // Moves back by 1 position in |context| and adjusts |buffer| accordingly @@ -34,7 +32,7 @@ class CBC_C40Encoder : public CBC_Encoder { // |context| after adjusting the position. If the character cannot be encoded, // return -1. int32_t BacktrackOneCharacter(CBC_EncoderContext* context, - CFX_WideString* buffer, + WideString* buffer, int32_t lastCharSize); }; -- cgit v1.2.3