From e556123e343b88e549be8dc3f79f671ce5cf504c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Wed, 3 May 2017 11:04:29 +0200
Subject: [PATCH] [apps/graph] Clean

Change-Id: I2f2f8db4cd7682ad89b808f5cd3ba23e93a8488e
---
 .../values/derivative_parameter_controller.cpp     |  2 +-
 .../graph/values/function_parameter_controller.cpp |  2 +-
 apps/graph/values/values_controller.cpp            | 14 +++-----------
 apps/graph/values/values_controller.h              |  2 --
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/apps/graph/values/derivative_parameter_controller.cpp b/apps/graph/values/derivative_parameter_controller.cpp
index 1af323201..caf0f7d64 100644
--- a/apps/graph/values/derivative_parameter_controller.cpp
+++ b/apps/graph/values/derivative_parameter_controller.cpp
@@ -46,7 +46,7 @@ bool DerivativeParameterController::handleEvent(Ion::Events::Event event) {
     switch (selectedRow()) {
       case 0:
       {
-        m_valuesController->selectCellAtLocation(m_valuesController->activeColumn()-1, m_valuesController->activeRow());
+        m_valuesController->selectCellAtLocation(m_valuesController->selectedColumn()-1, m_valuesController->selectedRow());
         m_function->setDisplayDerivative(false);
         StackViewController * stack = (StackViewController *)(parentResponder());
         stack->pop();
diff --git a/apps/graph/values/function_parameter_controller.cpp b/apps/graph/values/function_parameter_controller.cpp
index 6ee871741..cba1d431d 100644
--- a/apps/graph/values/function_parameter_controller.cpp
+++ b/apps/graph/values/function_parameter_controller.cpp
@@ -26,7 +26,7 @@ bool FunctionParameterController::handleEvent(Ion::Events::Event event) {
       {
         m_cartesianFunction->setDisplayDerivative(!m_cartesianFunction->displayDerivative());
         if (m_cartesianFunction->displayDerivative()) {
-          m_valuesController->selectCellAtLocation(m_valuesController->activeColumn()+1, m_valuesController->activeRow());
+          m_valuesController->selectCellAtLocation(m_valuesController->selectedColumn()+1, m_valuesController->selectedRow());
         }
         m_selectableTableView.reloadData();
         return true;
diff --git a/apps/graph/values/values_controller.cpp b/apps/graph/values/values_controller.cpp
index 49803355a..cf21eea37 100644
--- a/apps/graph/values/values_controller.cpp
+++ b/apps/graph/values/values_controller.cpp
@@ -17,8 +17,8 @@ ValuesController::ValuesController(Responder * parentResponder, CartesianFunctio
 }
 
 bool ValuesController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK && activeRow() == 0
-      && activeColumn()>0 && isDerivativeColumn(activeColumn())) {
+  if (event == Ion::Events::OK && selectedRow() == 0
+      && selectedColumn()>0 && isDerivativeColumn(selectedColumn())) {
     configureDerivativeFunction();
     return true;
   }
@@ -69,14 +69,6 @@ I18n::Message ValuesController::emptyMessage() {
   return I18n::Message::NoActivatedFunction;
 }
 
-int ValuesController::activeRow() {
-  return selectedRow();
-}
-
-int ValuesController::activeColumn() {
-  return selectedColumn();
-}
-
 IntervalParameterController * ValuesController::intervalParameterController() {
   return &m_intervalParameterController;
 }
@@ -124,7 +116,7 @@ bool ValuesController::isDerivativeColumn(int i) {
 }
 
 void ValuesController::configureDerivativeFunction() {
-  CartesianFunction * function = functionAtColumn(activeColumn());
+  CartesianFunction * function = functionAtColumn(selectedColumn());
   m_derivativeParameterController.setFunction(function);
   StackViewController * stack = stackController();
   stack->push(&m_derivativeParameterController);
diff --git a/apps/graph/values/values_controller.h b/apps/graph/values/values_controller.h
index f264ba4f2..5b0a79917 100644
--- a/apps/graph/values/values_controller.h
+++ b/apps/graph/values/values_controller.h
@@ -17,8 +17,6 @@ public:
   int numberOfColumns() override;
   void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
   I18n::Message emptyMessage() override;
-  int activeRow();
-  int activeColumn();
   Shared::IntervalParameterController * intervalParameterController() override;
 private:
   CartesianFunction * functionAtColumn(int i) override;