From b44c5e6d059eb2dea193c12668b3b2740265f965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Fri, 16 Nov 2018 16:41:47 +0100
Subject: [PATCH] [shared] Change name:
 StorageExpressionModel::expressionWithSymbol --> expressionClone

---
 apps/shared/global_context.cpp           | 2 +-
 apps/shared/storage_expression_model.cpp | 6 +++---
 apps/shared/storage_expression_model.h   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/shared/global_context.cpp b/apps/shared/global_context.cpp
index 4757dd4a6..2da769330 100644
--- a/apps/shared/global_context.cpp
+++ b/apps/shared/global_context.cpp
@@ -49,7 +49,7 @@ Poincare::Expression GlobalContext::ExpressionFromFunctionRecord(Ion::Storage::R
   /* An function record value has metadata before the expression. To get the
    * expression, use the function record handle. */
   StorageCartesianFunction f = StorageCartesianFunction(record);
-  return f.expressionWithSymbol();
+  return f.expressionClone();
 }
 
 void GlobalContext::DestroyRecordsBaseNamedWithoutExtension(const char * baseName, const char * extension) {
diff --git a/apps/shared/storage_expression_model.cpp b/apps/shared/storage_expression_model.cpp
index 28a9a9c87..41875194e 100644
--- a/apps/shared/storage_expression_model.cpp
+++ b/apps/shared/storage_expression_model.cpp
@@ -20,7 +20,7 @@ StorageExpressionModel::StorageExpressionModel(Storage::Record record) :
 }
 
 void StorageExpressionModel::text(char * buffer, size_t bufferSize) const {
-  Expression e = expressionWithSymbol();
+  Expression e = expressionClone();
   if (e.isUninitialized() && bufferSize > 0) {
     buffer[0] = 0;
   } else {
@@ -44,7 +44,7 @@ Expression StorageExpressionModel::expressionReduced(Poincare::Context * context
   return m_expression;
 }
 
-Expression StorageExpressionModel::expressionWithSymbol() const {
+Expression StorageExpressionModel::expressionClone() const {
   assert(!isNull());
   Ion::Storage::Record::Data recordData = value();
   /* A new Expression has to be created at each call (because it might be tempered with after calling) */
@@ -53,7 +53,7 @@ Expression StorageExpressionModel::expressionWithSymbol() const {
 
 Layout StorageExpressionModel::layout() {
   if (m_layout.isUninitialized()) {
-    m_layout = PoincareHelpers::CreateLayout(expressionWithSymbol());
+    m_layout = PoincareHelpers::CreateLayout(expressionClone());
     if (m_layout.isUninitialized()) {
       m_layout = HorizontalLayout();
     }
diff --git a/apps/shared/storage_expression_model.h b/apps/shared/storage_expression_model.h
index e647b84f2..899e119f8 100644
--- a/apps/shared/storage_expression_model.h
+++ b/apps/shared/storage_expression_model.h
@@ -16,7 +16,7 @@ public:
   StorageExpressionModel(Ion::Storage::Record record);
   void text(char * buffer, size_t bufferSize) const;
   Poincare::Expression expressionReduced(Poincare::Context * context) const;
-  Poincare::Expression expressionWithSymbol() const;
+  Poincare::Expression expressionClone() const;
   Poincare::Layout layout();
   /* TODO This comment will be true when Sequence inherits from this class
    * Here, isDefined is the exact contrary of isEmpty. However, for Sequence