From 1d7bd2b70a266017571152330897e08034b0c91b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Tue, 8 May 2018 16:33:55 +0200
Subject: [PATCH] [calculation] Change method name:
 shouldDisplayApproximateOutput --> shouldOnlyDisplayApproximateOutput

---
 apps/calculation/calculation.cpp            | 2 +-
 apps/calculation/calculation.h              | 2 +-
 apps/calculation/history_controller.cpp     | 2 +-
 apps/calculation/history_view_cell.cpp      | 2 +-
 apps/calculation/test/calculation_store.cpp | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/calculation/calculation.cpp b/apps/calculation/calculation.cpp
index b6f8c2d5d..50db35405 100644
--- a/apps/calculation/calculation.cpp
+++ b/apps/calculation/calculation.cpp
@@ -184,7 +184,7 @@ ExpressionLayout * Calculation::approximateOutputLayout(Context * context) {
   return m_approximateOutputLayout;
 }
 
-bool Calculation::shouldDisplayApproximateOutput(Context * context) {
+bool Calculation::shouldOnlyDisplayApproximateOutput(Context * context) {
   if (strcmp(m_exactOutputText, m_approximateOutputText) == 0) {
     return true;
   }
diff --git a/apps/calculation/calculation.h b/apps/calculation/calculation.h
index ff9b1c8cb..8a224cd69 100644
--- a/apps/calculation/calculation.h
+++ b/apps/calculation/calculation.h
@@ -35,7 +35,7 @@ public:
   Poincare::ExpressionLayout * approximateOutputLayout(Poincare::Context * context);
   bool isEmpty();
   void tidy();
-  bool shouldDisplayApproximateOutput(Poincare::Context * context);
+  bool shouldOnlyDisplayApproximateOutput(Poincare::Context * context);
   EqualSign exactAndApproximateDisplayedOutputsAreEqual(Poincare::Context * context);
   constexpr static int k_printedExpressionSize = 2*::TextField::maxBufferSize();
 private:
diff --git a/apps/calculation/history_controller.cpp b/apps/calculation/history_controller.cpp
index ba83db893..90bffc092 100644
--- a/apps/calculation/history_controller.cpp
+++ b/apps/calculation/history_controller.cpp
@@ -162,7 +162,7 @@ KDCoordinate HistoryController::rowHeight(int j) {
   App * calculationApp = (App *)app();
   Poincare::ExpressionLayout * approximateLayout = calculation->approximateOutputLayout(calculationApp->localContext());
   KDCoordinate approximateOutputHeight = approximateLayout->size().height();
-  if (calculation->shouldDisplayApproximateOutput(calculationApp->localContext())) {
+  if (calculation->shouldOnlyDisplayApproximateOutput(calculationApp->localContext())) {
     return inputHeight + approximateOutputHeight + 3*HistoryViewCell::k_digitVerticalMargin;
   }
   Poincare::ExpressionLayout * exactLayout = calculation->exactOutputLayout(calculationApp->localContext());
diff --git a/apps/calculation/history_view_cell.cpp b/apps/calculation/history_view_cell.cpp
index c0546edd3..119c3ec54 100644
--- a/apps/calculation/history_view_cell.cpp
+++ b/apps/calculation/history_view_cell.cpp
@@ -88,7 +88,7 @@ void HistoryViewCell::setCalculation(Calculation * calculation) {
   /* Both output expressions have to be updated at the same time. The
    * outputView points to deleted layouts and a call to
    * outputView()->layoutSubviews() is going to fail. */
-  Poincare::ExpressionLayout * outputExpressions[2] = {calculation->approximateOutputLayout(calculationApp->localContext()), calculation->shouldDisplayApproximateOutput(calculationApp->localContext()) ? nullptr : calculation->exactOutputLayout(calculationApp->localContext())};
+  Poincare::ExpressionLayout * outputExpressions[2] = {calculation->approximateOutputLayout(calculationApp->localContext()), calculation->shouldOnlyDisplayApproximateOutput(calculationApp->localContext()) ? nullptr : calculation->exactOutputLayout(calculationApp->localContext())};
   m_scrollableOutputView.outputView()->setExpressions(outputExpressions);
   I18n::Message equalMessage = calculation->exactAndApproximateDisplayedOutputsAreEqual(calculationApp->localContext()) == Calculation::EqualSign::Equal ? I18n::Message::Equal : I18n::Message::AlmostEqual;
   m_scrollableOutputView.outputView()->setEqualMessage(equalMessage);
diff --git a/apps/calculation/test/calculation_store.cpp b/apps/calculation/test/calculation_store.cpp
index 260fd9d97..847fd01ad 100644
--- a/apps/calculation/test/calculation_store.cpp
+++ b/apps/calculation/test/calculation_store.cpp
@@ -50,11 +50,11 @@ QUIZ_CASE(calculation_store) {
   store.push("1+3/4", &globalContext);
   store.push("ans+2/3", &globalContext);
   ::Calculation::Calculation * lastCalculation = store.calculationAtIndex(1);
-  assert(lastCalculation->shouldDisplayApproximateOutput(&globalContext) == false);
+  assert(lastCalculation->shouldOnlyDisplayApproximateOutput(&globalContext) == false);
   assert(strcmp(lastCalculation->exactOutputText(),"29/12") == 0);
 
   store.push("ans+0.22", &globalContext);
   lastCalculation = store.calculationAtIndex(2);
-  assert(lastCalculation->shouldDisplayApproximateOutput(&globalContext) == true);
+  assert(lastCalculation->shouldOnlyDisplayApproximateOutput(&globalContext) == true);
   assert(strcmp(lastCalculation->approximateOutputText(),"2.6366666666667") == 0);
 }