From 9480bcacd54b47d8cae7b536424dc2212d372795 Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Tue, 17 Sep 2019 13:52:16 +0200
Subject: [PATCH] [apps/*/expression_model] Make expressionAddress private

---
 apps/sequence/sequence.h          | 6 ++----
 apps/shared/continuous_function.h | 3 +--
 apps/shared/expression_model.h    | 2 +-
 apps/solver/equation.h            | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/sequence/sequence.h b/apps/sequence/sequence.h
index b866d4fb2..9647b9ba8 100644
--- a/apps/sequence/sequence.h
+++ b/apps/sequence/sequence.h
@@ -121,18 +121,16 @@ private:
   };
 
   class DefinitionModel : public SequenceModel {
-  public:
-    void * expressionAddress(const Ion::Storage::Record * record) const override;
   private:
+    void * expressionAddress(const Ion::Storage::Record * record) const override;
     size_t expressionSize(const Ion::Storage::Record * record) const override;
     void buildName(Sequence * sequence) override;
   };
 
   class InitialConditionModel : public SequenceModel {
-  public:
-    void * expressionAddress(const Ion::Storage::Record * record) const override;
   private:
     void updateMetaData(const Ion::Storage::Record * record, size_t newSize) override;
+    void * expressionAddress(const Ion::Storage::Record * record) const override;
     size_t expressionSize(const Ion::Storage::Record * record) const override;
     void buildName(Sequence * sequence) override;
     virtual int conditionIndex() const = 0;
diff --git a/apps/shared/continuous_function.h b/apps/shared/continuous_function.h
index 47dc04ddd..2f07d327e 100644
--- a/apps/shared/continuous_function.h
+++ b/apps/shared/continuous_function.h
@@ -106,9 +106,8 @@ private:
     //char m_expression[0];
   };
   class Model : public ExpressionModel {
-  public:
-    void * expressionAddress(const Ion::Storage::Record * record) const override;
   private:
+    void * expressionAddress(const Ion::Storage::Record * record) const override;
     size_t expressionSize(const Ion::Storage::Record * record) const override;
   };
   size_t metaDataSize() const override { return sizeof(RecordDataBuffer); }
diff --git a/apps/shared/expression_model.h b/apps/shared/expression_model.h
index 87bade87c..eef47590f 100644
--- a/apps/shared/expression_model.h
+++ b/apps/shared/expression_model.h
@@ -23,7 +23,6 @@ public:
 
   // Property
   bool isCircularlyDefined(const Ion::Storage::Record * record, Poincare::Context * context) const;
-  virtual void * expressionAddress(const Ion::Storage::Record * record) const = 0;
 
   virtual void tidy() const;
 protected:
@@ -33,6 +32,7 @@ protected:
   mutable Poincare::Layout m_layout;
 private:
   virtual void updateNewDataWithExpression(Ion::Storage::Record * record, const Poincare::Expression & expressionToStore, void * expressionAddress, size_t expressionToStoreSize, size_t previousExpressionSize);
+  virtual void * expressionAddress(const Ion::Storage::Record * record) const = 0;
   virtual size_t expressionSize(const Ion::Storage::Record * record) const = 0;
   mutable int m_circular;
 };
diff --git a/apps/solver/equation.h b/apps/solver/equation.h
index 63fe1b11e..5add58440 100644
--- a/apps/solver/equation.h
+++ b/apps/solver/equation.h
@@ -19,8 +19,8 @@ private:
   public:
     Poincare::Expression standardForm(const Ion::Storage::Record * record, Poincare::Context * context) const;
     void tidy() const override;
-    void * expressionAddress(const Ion::Storage::Record * record) const override;
   private:
+    void * expressionAddress(const Ion::Storage::Record * record) const override;
     size_t expressionSize(const Ion::Storage::Record * record) const override;
     mutable Poincare::Expression m_standardForm;
   };