From 4b4aad556f77c703733a901d33e4f668e05cb92e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Mon, 19 Dec 2016 15:35:28 +0100
Subject: [PATCH] [escher] Change even odd editable cell constructor

Change-Id: I2a4e5223e0806433e2e8ece998e0207dcab10e9e
---
 apps/graph/values/values_controller.cpp             |  8 ++------
 escher/include/escher/even_odd_editable_text_cell.h |  3 +--
 escher/src/even_odd_editable_text_cell.cpp          | 10 +++-------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/apps/graph/values/values_controller.cpp b/apps/graph/values/values_controller.cpp
index c7d3e6f9c..973e25c4a 100644
--- a/apps/graph/values/values_controller.cpp
+++ b/apps/graph/values/values_controller.cpp
@@ -10,8 +10,8 @@ ValuesController::ValuesController(Responder * parentResponder, FunctionStore *
   ViewController(parentResponder),
   HeaderViewDelegate(header),
   m_selectableTableView(SelectableTableView(this, this, k_topMargin, k_rightMargin, k_bottomMargin, k_leftMargin, this)),
-  m_abscissaCells{EvenOddEditableTextCell(m_draftTextBuffer), EvenOddEditableTextCell(m_draftTextBuffer), EvenOddEditableTextCell(m_draftTextBuffer),EvenOddEditableTextCell(m_draftTextBuffer),
-    EvenOddEditableTextCell(m_draftTextBuffer), EvenOddEditableTextCell(m_draftTextBuffer), EvenOddEditableTextCell(m_draftTextBuffer), EvenOddEditableTextCell(m_draftTextBuffer)},
+  m_abscissaCells{EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer),EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer),
+    EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer)},
   m_functionStore(functionStore),
   m_intervalParameterController(IntervalParameterController(this, &m_interval)),
   m_abscissaParameterController(AbscissaParameterController(this, &m_intervalParameterController)),
@@ -26,10 +26,6 @@ ValuesController::ValuesController(Responder * parentResponder, FunctionStore *
   m_interval.setStart(0);
   m_interval.setEnd(10);
   m_interval.setStep(1);
-  for (int k = 0; k < k_maxNumberOfAbscissaCells; k++) {
-    m_abscissaCells[k].setParentResponder(&m_selectableTableView);
-    m_abscissaCells[k].setDelegate(this);
-  }
 }
 
 View * ValuesController::view() {
diff --git a/escher/include/escher/even_odd_editable_text_cell.h b/escher/include/escher/even_odd_editable_text_cell.h
index 3aa7a9a0f..421256de0 100644
--- a/escher/include/escher/even_odd_editable_text_cell.h
+++ b/escher/include/escher/even_odd_editable_text_cell.h
@@ -7,8 +7,7 @@
 
 class EvenOddEditableTextCell : public EvenOddCell, public Responder {
 public:
-  EvenOddEditableTextCell(char * draftTextBuffer);
-  void setDelegate(TextFieldDelegate * delegate);
+  EvenOddEditableTextCell(Responder * parentResponder, TextFieldDelegate * delegate, char * draftTextBuffer);
   void reloadCell() override;
   const char * text() const;
   void setText(const char * textContent);
diff --git a/escher/src/even_odd_editable_text_cell.cpp b/escher/src/even_odd_editable_text_cell.cpp
index 2a60a84eb..4a75b3e27 100644
--- a/escher/src/even_odd_editable_text_cell.cpp
+++ b/escher/src/even_odd_editable_text_cell.cpp
@@ -2,17 +2,13 @@
 #include <escher/app.h>
 #include <assert.h>
 
-EvenOddEditableTextCell::EvenOddEditableTextCell(char * draftTextBuffer) :
+EvenOddEditableTextCell::EvenOddEditableTextCell(Responder * parentResponder, TextFieldDelegate * delegate, char * draftTextBuffer) :
   EvenOddCell(),
-  Responder(nullptr),
-  m_editableCell(this, nullptr, draftTextBuffer, 1.0f, 0.5f, KDColorBlack, KDColorWhite)
+  Responder(parentResponder),
+  m_editableCell(this, delegate, draftTextBuffer, 1.0f, 0.5f, KDColorBlack, KDColorWhite)
 {
 }
 
-void EvenOddEditableTextCell::setDelegate(TextFieldDelegate * delegate) {
-  m_editableCell.textfield()->setTextFieldDelegate(delegate);
-}
-
 void EvenOddEditableTextCell::reloadCell() {
   EvenOddCell::reloadCell();
   m_editableCell.textfield()->setBackgroundColor(backgroundColor());