From 23e98275242ee116a589e6793a46521c49d1b1bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Fri, 12 Oct 2018 15:04:01 +0200
Subject: [PATCH] [shared] GlobalContext: change name RecordBaseNameIsFree -->
 SymbolAbstractNameIsFree

---
 apps/shared/global_context.cpp             | 10 +++++-----
 apps/shared/global_context.h               |  4 ++--
 apps/shared/storage_cartesian_function.cpp |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/shared/global_context.cpp b/apps/shared/global_context.cpp
index 4403979e1..cd63ee6a4 100644
--- a/apps/shared/global_context.cpp
+++ b/apps/shared/global_context.cpp
@@ -17,8 +17,8 @@ constexpr char GlobalContext::funcExtension[];
 
 static bool sStorageMemoryFull = false;
 
-bool GlobalContext::RecordBaseNameIsFree(const char * baseName) {
-  return RecordWithBaseName(baseName).isNull();
+bool GlobalContext::SymbolAbstractNameIsFree(const char * baseName) {
+  return SymbolAbstractRecordWithBaseName(baseName).isNull();
 }
 
 bool GlobalContext::storageMemoryFull() {
@@ -57,7 +57,7 @@ Poincare::Expression GlobalContext::ExpressionFromFunctionRecord(Ion::Storage::R
 }
 
 const Expression GlobalContext::expressionForSymbol(const SymbolAbstract & symbol) {
-  Ion::Storage::Record r = RecordWithBaseName(symbol.name());
+  Ion::Storage::Record r = SymbolAbstractRecordWithBaseName(symbol.name());
   return ExpressionForSymbolAndRecord(symbol, r);
 }
 
@@ -65,7 +65,7 @@ void GlobalContext::setExpressionForSymbol(const Expression & expression, const
   sStorageMemoryFull = false;
   /* If the new expression contains the symbol, replace it because it will be
    * destroyed afterwards (to be able to do A+2->A) */
-  Ion::Storage::Record record = RecordWithBaseName(symbol.name());
+  Ion::Storage::Record record = SymbolAbstractRecordWithBaseName(symbol.name());
   Expression e = ExpressionFromRecord(record);
   if (e.isUninitialized()) {
     e = Undefined();
@@ -139,7 +139,7 @@ Ion::Storage::Record::ErrorStatus GlobalContext::SetExpressionForFunction(const
   return SetExpressionForFunctionRecord(expressionToStore, previousRecord, symbol.name());
 }
 
-Ion::Storage::Record GlobalContext::RecordWithBaseName(const char * name) {
+Ion::Storage::Record GlobalContext::SymbolAbstractRecordWithBaseName(const char * name) {
   const char * extensions[2] = {expExtension, funcExtension/*, seqExtension*/};
   return Ion::Storage::sharedStorage()->recordBaseNamedWithExtensions(name, extensions, 2);
 }
diff --git a/apps/shared/global_context.h b/apps/shared/global_context.h
index 377fa79cd..a25419cc0 100644
--- a/apps/shared/global_context.h
+++ b/apps/shared/global_context.h
@@ -20,7 +20,7 @@ public:
   //static constexpr char seqExtension[] = "seq";
 
   // Storage information
-  static bool RecordBaseNameIsFree(const char * baseName);
+  static bool SymbolAbstractNameIsFree(const char * baseName);
   static bool storageMemoryFull();
 
   // Expression from record
@@ -52,7 +52,7 @@ private:
   static Ion::Storage::Record::ErrorStatus SetExpressionForActualSymbol(const Poincare::Expression & expression, const Poincare::SymbolAbstract & symbol, Ion::Storage::Record previousRecord);
   static Ion::Storage::Record::ErrorStatus SetExpressionForFunction(const Poincare::Expression & expression, const Poincare::SymbolAbstract & symbol, Ion::Storage::Record previousRecord);
   // Record getter
-  static Ion::Storage::Record RecordWithBaseName(const char * name);
+  static Ion::Storage::Record SymbolAbstractRecordWithBaseName(const char * name);
 };
 
 }
diff --git a/apps/shared/storage_cartesian_function.cpp b/apps/shared/storage_cartesian_function.cpp
index 999771427..927e66886 100644
--- a/apps/shared/storage_cartesian_function.cpp
+++ b/apps/shared/storage_cartesian_function.cpp
@@ -24,7 +24,7 @@ void StorageCartesianFunction::DefaultName(char buffer[], size_t bufferSize) {
   int availableBufferSize = bufferSize - constantNameLength;
   while (currentNumberLength < availableBufferSize) {
     currentNumberLength = Poincare::Integer(currentNumber).serialize(&buffer[1], availableBufferSize);
-    if (GlobalContext::RecordBaseNameIsFree(buffer)) {
+    if (GlobalContext::SymbolAbstractNameIsFree(buffer)) {
       // Name found
       break;
     }