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_fmsimpleexpression.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h') diff --git a/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h b/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h index a9e9f90289..864c822a12 100644 --- a/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h +++ b/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h @@ -45,7 +45,7 @@ enum XFA_FM_SimpleExpressionType { class CFX_WideTextBuf; -CFX_WideStringC XFA_FM_EXPTypeToString( +WideStringView XFA_FM_EXPTypeToString( XFA_FM_SimpleExpressionType simpleExpType); enum XFA_FM_AccessorIndex { @@ -78,32 +78,32 @@ class CXFA_FMNullExpression : public CXFA_FMSimpleExpression { class CXFA_FMNumberExpression : public CXFA_FMSimpleExpression { public: - CXFA_FMNumberExpression(uint32_t line, CFX_WideStringC wsNumber); + CXFA_FMNumberExpression(uint32_t line, WideStringView wsNumber); ~CXFA_FMNumberExpression() override; bool ToJavaScript(CFX_WideTextBuf& javascript) override; private: - CFX_WideStringC m_wsNumber; + WideStringView m_wsNumber; }; class CXFA_FMStringExpression : public CXFA_FMSimpleExpression { public: - CXFA_FMStringExpression(uint32_t line, CFX_WideStringC wsString); + CXFA_FMStringExpression(uint32_t line, WideStringView wsString); ~CXFA_FMStringExpression() override; bool ToJavaScript(CFX_WideTextBuf& javascript) override; private: - CFX_WideStringC m_wsString; + WideStringView m_wsString; }; class CXFA_FMIdentifierExpression : public CXFA_FMSimpleExpression { public: - CXFA_FMIdentifierExpression(uint32_t line, CFX_WideStringC wsIdentifier); + CXFA_FMIdentifierExpression(uint32_t line, WideStringView wsIdentifier); ~CXFA_FMIdentifierExpression() override; bool ToJavaScript(CFX_WideTextBuf& javascript) override; private: - CFX_WideStringC m_wsIdentifier; + WideStringView m_wsIdentifier; }; class CXFA_FMUnaryExpression : public CXFA_FMSimpleExpression { @@ -240,7 +240,7 @@ class CXFA_FMCallExpression : public CXFA_FMUnaryExpression { ~CXFA_FMCallExpression() override; bool IsBuiltInFunc(CFX_WideTextBuf* funcName); - uint32_t IsMethodWithObjParam(const CFX_WideString& methodName); + uint32_t IsMethodWithObjParam(const WideString& methodName); bool ToJavaScript(CFX_WideTextBuf& javascript) override; private: @@ -254,13 +254,13 @@ class CXFA_FMDotAccessorExpression : public CXFA_FMBinExpression { uint32_t line, std::unique_ptr pAccessor, XFA_FM_TOKEN op, - CFX_WideStringC wsIdentifier, + WideStringView wsIdentifier, std::unique_ptr pIndexExp); ~CXFA_FMDotAccessorExpression() override; bool ToJavaScript(CFX_WideTextBuf& javascript) override; private: - CFX_WideStringC m_wsIdentifier; + WideStringView m_wsIdentifier; }; class CXFA_FMIndexExpression : public CXFA_FMUnaryExpression { @@ -283,14 +283,14 @@ class CXFA_FMDotDotAccessorExpression : public CXFA_FMBinExpression { uint32_t line, std::unique_ptr pAccessor, XFA_FM_TOKEN op, - CFX_WideStringC wsIdentifier, + WideStringView wsIdentifier, std::unique_ptr pIndexExp); ~CXFA_FMDotDotAccessorExpression() override; bool ToJavaScript(CFX_WideTextBuf& javascript) override; private: - CFX_WideStringC m_wsIdentifier; + WideStringView m_wsIdentifier; }; class CXFA_FMMethodCallExpression : public CXFA_FMBinExpression { -- cgit v1.2.3