From ca27127240fbca2184f1c576b15b5212d5b314e6 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 3 Aug 2016 10:48:00 -0700 Subject: Fixup class name spelling Fix CXFA_FMIdentifierExpressionn to remove the duplicate n. Review-Url: https://codereview.chromium.org/2210543002 --- xfa/fxfa/fm2js/xfa_fmparse.cpp | 6 +++--- xfa/fxfa/fm2js/xfa_simpleexpression.cpp | 6 +++--- xfa/fxfa/fm2js/xfa_simpleexpression.h | 6 +++--- xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xfa/fxfa/fm2js/xfa_fmparse.cpp b/xfa/fxfa/fm2js/xfa_fmparse.cpp index bc7b91b4e6..5c17bbc723 100644 --- a/xfa/fxfa/fm2js/xfa_fmparse.cpp +++ b/xfa/fxfa/fm2js/xfa_fmparse.cpp @@ -519,11 +519,11 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePrimaryExpression() { } NextToken(); } else { - e.reset(new CXFA_FMIdentifierExpressionn(line, wsIdentifier)); + e.reset(new CXFA_FMIdentifierExpression(line, wsIdentifier)); } } break; case TOKif: - e.reset(new CXFA_FMIdentifierExpressionn(line, m_pToken->m_wstring)); + e.reset(new CXFA_FMIdentifierExpression(line, m_pToken->m_wstring)); NextToken(); break; case TOKnull: @@ -627,7 +627,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression( } if (m_pErrorInfo->message.IsEmpty()) { CXFA_FMSimpleExpression* pIdentifier = - new CXFA_FMIdentifierExpressionn(tempLine, tempStr); + new CXFA_FMIdentifierExpression(tempLine, tempStr); pExpCall = new CXFA_FMCallExpression(line, pIdentifier, pArray.release(), TRUE); e = new CXFA_FMMethodCallExpression(line, pExpAccessor, pExpCall); diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp b/xfa/fxfa/fm2js/xfa_simpleexpression.cpp index a7a88ec30a..089333b774 100644 --- a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp +++ b/xfa/fxfa/fm2js/xfa_simpleexpression.cpp @@ -175,15 +175,15 @@ void CXFA_FMStringExpression::ToJavaScript(CFX_WideTextBuf& javascript) { } } -CXFA_FMIdentifierExpressionn::CXFA_FMIdentifierExpressionn( +CXFA_FMIdentifierExpression::CXFA_FMIdentifierExpression( uint32_t line, CFX_WideStringC wsIdentifier) : CXFA_FMSimpleExpression(line, TOKidentifier), m_wsIdentifier(wsIdentifier) {} -CXFA_FMIdentifierExpressionn::~CXFA_FMIdentifierExpressionn() {} +CXFA_FMIdentifierExpression::~CXFA_FMIdentifierExpression() {} -void CXFA_FMIdentifierExpressionn::ToJavaScript(CFX_WideTextBuf& javascript) { +void CXFA_FMIdentifierExpression::ToJavaScript(CFX_WideTextBuf& javascript) { CFX_WideString tempStr(m_wsIdentifier); if (tempStr == FX_WSTRC(L"$")) { tempStr = FX_WSTRC(L"this"); diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.h b/xfa/fxfa/fm2js/xfa_simpleexpression.h index 27086f4cc4..857cd518cf 100644 --- a/xfa/fxfa/fm2js/xfa_simpleexpression.h +++ b/xfa/fxfa/fm2js/xfa_simpleexpression.h @@ -96,10 +96,10 @@ class CXFA_FMStringExpression : public CXFA_FMSimpleExpression { CFX_WideStringC m_wsString; }; -class CXFA_FMIdentifierExpressionn : public CXFA_FMSimpleExpression { +class CXFA_FMIdentifierExpression : public CXFA_FMSimpleExpression { public: - CXFA_FMIdentifierExpressionn(uint32_t line, CFX_WideStringC wsIdentifier); - ~CXFA_FMIdentifierExpressionn() override; + CXFA_FMIdentifierExpression(uint32_t line, CFX_WideStringC wsIdentifier); + ~CXFA_FMIdentifierExpression() override; void ToJavaScript(CFX_WideTextBuf& javascript) override; private: diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp b/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp index 171922aecd..3c0a69c100 100644 --- a/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp +++ b/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp @@ -11,8 +11,8 @@ TEST(FMCallExpression, more_than_32_arguments) { // Use sign as it has 3 object parameters at positions 0, 5, and 6. - std::unique_ptr exp( - new CXFA_FMIdentifierExpressionn(0, CFX_WideStringC(L"sign"))); + std::unique_ptr exp( + new CXFA_FMIdentifierExpression(0, CFX_WideStringC(L"sign"))); std::unique_ptr> args( new CFX_ArrayTemplate()); -- cgit v1.2.3