From 4396a82452b4335faf8944d71fa9379077351ff3 Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Mon, 8 Jul 2019 17:52:02 +0200
Subject: [PATCH] [apps/*/values*function_parameter_controller] Get the symbol
 from the FunctionStore

---
 apps/graph/values/function_parameter_controller.cpp  | 2 +-
 apps/shared/values_function_parameter_controller.cpp | 3 ++-
 apps/shared/values_function_parameter_controller.h   | 6 ++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/graph/values/function_parameter_controller.cpp b/apps/graph/values/function_parameter_controller.cpp
index be0775ff5..d98ae7920 100644
--- a/apps/graph/values/function_parameter_controller.cpp
+++ b/apps/graph/values/function_parameter_controller.cpp
@@ -8,7 +8,7 @@ using namespace Shared;
 namespace Graph {
 
 FunctionParameterController::FunctionParameterController(ValuesController * valuesController) :
-  ValuesFunctionParameterController(CartesianFunction::Symbol()),
+  ValuesFunctionParameterController(),
   m_displayDerivativeColumn(I18n::Message::DerivativeFunctionColumn),
   m_valuesController(valuesController)
 {
diff --git a/apps/shared/values_function_parameter_controller.cpp b/apps/shared/values_function_parameter_controller.cpp
index 6c6c6ac8a..09f1a4f9a 100644
--- a/apps/shared/values_function_parameter_controller.cpp
+++ b/apps/shared/values_function_parameter_controller.cpp
@@ -9,7 +9,8 @@ const char * ValuesFunctionParameterController::title() {
 }
 
 void ValuesFunctionParameterController::viewWillAppear() {
-  FunctionApp::app()->functionStore()->modelForRecord(m_record)->nameWithArgument(m_pageTitle, Function::k_maxNameWithArgumentSize, m_symbol);
+  CodePoint symbol = FunctionApp::app()->functionStore()->symbol();
+  FunctionApp::app()->functionStore()->modelForRecord(m_record)->nameWithArgument(m_pageTitle, Function::k_maxNameWithArgumentSize, symbol);
 }
 
 void ValuesFunctionParameterController::didBecomeFirstResponder() {
diff --git a/apps/shared/values_function_parameter_controller.h b/apps/shared/values_function_parameter_controller.h
index 62d0522bb..8e2fabc02 100644
--- a/apps/shared/values_function_parameter_controller.h
+++ b/apps/shared/values_function_parameter_controller.h
@@ -9,12 +9,11 @@ namespace Shared {
 
 class ValuesFunctionParameterController : public ViewController, public SimpleListViewDataSource, public SelectableTableViewDataSource {
 public:
-  ValuesFunctionParameterController(char symbol) :
+  ValuesFunctionParameterController() :
     ViewController(nullptr),
     m_copyColumn(I18n::Message::CopyColumnInList),
     m_selectableTableView(this, this, this),
-    m_record(),
-    m_symbol(symbol)
+    m_record()
   {}
 
   View * view() override { return &m_selectableTableView; }
@@ -35,7 +34,6 @@ protected:
   Ion::Storage::Record m_record;
 private:
   char m_pageTitle[Function::k_maxNameWithArgumentSize];
-  char m_symbol;
 };
 
 }