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 --- xfa/fxfa/fm2js/cxfa_fmexpression.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'xfa/fxfa/fm2js/cxfa_fmexpression.h') diff --git a/xfa/fxfa/fm2js/cxfa_fmexpression.h b/xfa/fxfa/fm2js/cxfa_fmexpression.h index 47b2d9cabd..cfbba3af22 100644 --- a/xfa/fxfa/fm2js/cxfa_fmexpression.h +++ b/xfa/fxfa/fm2js/cxfa_fmexpression.h @@ -47,8 +47,8 @@ class CXFA_FMFunctionDefinition : public CXFA_FMExpression { CXFA_FMFunctionDefinition( uint32_t line, bool isGlobal, - const CFX_WideStringC& wsName, - std::vector&& arguments, + const WideStringView& wsName, + std::vector&& arguments, std::vector>&& expressions); ~CXFA_FMFunctionDefinition() override; @@ -56,8 +56,8 @@ class CXFA_FMFunctionDefinition : public CXFA_FMExpression { bool ToImpliedReturnJS(CFX_WideTextBuf&) override; private: - CFX_WideStringC m_wsName; - std::vector m_pArguments; + WideStringView m_wsName; + std::vector m_pArguments; std::vector> m_pExpressions; bool m_isGlobal; }; @@ -65,7 +65,7 @@ class CXFA_FMFunctionDefinition : public CXFA_FMExpression { class CXFA_FMVarExpression : public CXFA_FMExpression { public: CXFA_FMVarExpression(uint32_t line, - const CFX_WideStringC& wsName, + const WideStringView& wsName, std::unique_ptr pInit); ~CXFA_FMVarExpression() override; @@ -73,7 +73,7 @@ class CXFA_FMVarExpression : public CXFA_FMExpression { bool ToImpliedReturnJS(CFX_WideTextBuf&) override; private: - CFX_WideStringC m_wsName; + WideStringView m_wsName; std::unique_ptr m_pInit; }; @@ -175,7 +175,7 @@ class CXFA_FMContinueExpression : public CXFA_FMExpression { class CXFA_FMForExpression : public CXFA_FMLoopExpression { public: CXFA_FMForExpression(uint32_t line, - const CFX_WideStringC& wsVariant, + const WideStringView& wsVariant, std::unique_ptr pAssignment, std::unique_ptr pAccessor, int32_t iDirection, @@ -187,7 +187,7 @@ class CXFA_FMForExpression : public CXFA_FMLoopExpression { bool ToImpliedReturnJS(CFX_WideTextBuf&) override; private: - CFX_WideStringC m_wsVariant; + WideStringView m_wsVariant; std::unique_ptr m_pAssignment; std::unique_ptr m_pAccessor; const bool m_bDirection; @@ -200,7 +200,7 @@ class CXFA_FMForeachExpression : public CXFA_FMLoopExpression { // Takes ownership of |pAccessors|. CXFA_FMForeachExpression( uint32_t line, - const CFX_WideStringC& wsIdentifier, + const WideStringView& wsIdentifier, std::vector>&& pAccessors, std::unique_ptr pList); ~CXFA_FMForeachExpression() override; @@ -209,7 +209,7 @@ class CXFA_FMForeachExpression : public CXFA_FMLoopExpression { bool ToImpliedReturnJS(CFX_WideTextBuf&) override; private: - CFX_WideStringC m_wsIdentifier; + WideStringView m_wsIdentifier; std::vector> m_pAccessors; std::unique_ptr m_pList; }; -- cgit v1.2.3