From 5afb49c85d7fa1445c27aa3e91327d6de47bc924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Tue, 4 Feb 2020 10:50:59 +0100 Subject: [PATCH] [poincare] Rename RightArrow -> RightwardsArrow --- poincare/Makefile | 2 +- ...ght_arrow_expression.h => rightwards_arrow_expression.h} | 6 +++--- poincare/include/poincare/store.h | 4 ++-- poincare/include/poincare/unit_convert.h | 4 ++-- ...arrow_expression.cpp => rightwards_arrow_expression.cpp} | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) rename poincare/include/poincare/{right_arrow_expression.h => rightwards_arrow_expression.h} (84%) rename poincare/src/{right_arrow_expression.cpp => rightwards_arrow_expression.cpp} (73%) diff --git a/poincare/Makefile b/poincare/Makefile index 2c022d50c..69dfcd8f5 100644 --- a/poincare/Makefile +++ b/poincare/Makefile @@ -124,7 +124,7 @@ poincare_src += $(addprefix poincare/src/,\ random.cpp \ rational.cpp \ real_part.cpp \ - right_arrow_expression.cpp \ + rightwards_arrow_expression.cpp \ round.cpp \ sequence.cpp \ serialization_helper.cpp \ diff --git a/poincare/include/poincare/right_arrow_expression.h b/poincare/include/poincare/rightwards_arrow_expression.h similarity index 84% rename from poincare/include/poincare/right_arrow_expression.h rename to poincare/include/poincare/rightwards_arrow_expression.h index 3343db646..a7a444bae 100644 --- a/poincare/include/poincare/right_arrow_expression.h +++ b/poincare/include/poincare/rightwards_arrow_expression.h @@ -1,5 +1,5 @@ -#ifndef POINCARE_RIGHT_ARROW_EXPRESSION_H -#define POINCARE_RIGHT_ARROW_EXPRESSION_H +#ifndef POINCARE_RIGHTWARDS_ARROW_EXPRESSION_H +#define POINCARE_RIGHTWARDS_ARROW_EXPRESSION_H #include #include @@ -7,7 +7,7 @@ namespace Poincare { -class RightArrowExpressionNode : public ExpressionNode { +class RightwardsArrowExpressionNode : public ExpressionNode { public: // TreeNode int numberOfChildren() const override { return 2; } diff --git a/poincare/include/poincare/store.h b/poincare/include/poincare/store.h index 776eff214..5c48f1b38 100644 --- a/poincare/include/poincare/store.h +++ b/poincare/include/poincare/store.h @@ -1,13 +1,13 @@ #ifndef POINCARE_STORE_H #define POINCARE_STORE_H -#include +#include #include #include namespace Poincare { -class StoreNode /*final*/ : public RightArrowExpressionNode { +class StoreNode /*final*/ : public RightwardsArrowExpressionNode { public: // TreeNode size_t size() const override { return sizeof(StoreNode); } diff --git a/poincare/include/poincare/unit_convert.h b/poincare/include/poincare/unit_convert.h index 0402bd993..a8b621268 100644 --- a/poincare/include/poincare/unit_convert.h +++ b/poincare/include/poincare/unit_convert.h @@ -1,13 +1,13 @@ #ifndef POINCARE_UNIT_CONVERT_H #define POINCARE_UNIT_CONVERT_H -#include +#include #include #include namespace Poincare { -class UnitConvertNode /*final*/ : public RightArrowExpressionNode { +class UnitConvertNode /*final*/ : public RightwardsArrowExpressionNode { public: // TreeNode size_t size() const override { return sizeof(UnitConvertNode); } diff --git a/poincare/src/right_arrow_expression.cpp b/poincare/src/rightwards_arrow_expression.cpp similarity index 73% rename from poincare/src/right_arrow_expression.cpp rename to poincare/src/rightwards_arrow_expression.cpp index 783470500..9eccce941 100644 --- a/poincare/src/right_arrow_expression.cpp +++ b/poincare/src/rightwards_arrow_expression.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -6,14 +6,14 @@ namespace Poincare { -int RightArrowExpressionNode::serialize(char * buffer, int bufferSize, Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const { +int RightwardsArrowExpressionNode::serialize(char * buffer, int bufferSize, Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const { constexpr int stringMaxSize = CodePoint::MaxCodePointCharLength + 1; char string[stringMaxSize]; SerializationHelper::CodePoint(string, stringMaxSize, UCodePointRightwardsArrow); return SerializationHelper::Infix(this, buffer, bufferSize, floatDisplayMode, numberOfSignificantDigits, string); } -Layout RightArrowExpressionNode::createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const { +Layout RightwardsArrowExpressionNode::createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const { HorizontalLayout result = HorizontalLayout::Builder(); result.addOrMergeChildAtIndex(childAtIndex(0)->createLayout(floatDisplayMode, numberOfSignificantDigits), 0, false); result.addChildAtIndex(CodePointLayout::Builder(UCodePointRightwardsArrow), result.numberOfChildren(), result.numberOfChildren(), nullptr);