From 5f9464a54870a95fa6f47fe9bbbcb4310fdf9118 Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Mon, 9 Sep 2019 16:25:32 +0200
Subject: [PATCH] [apps] In Shared, move cartesian_function.* to
 continuous_function.*

---
 apps/graph/continuous_function_store.h                        | 4 +---
 apps/graph/list/domain_parameter_controller.h                 | 2 +-
 apps/graph/values/function_parameter_controller.h             | 2 +-
 apps/graph/values/interval_parameter_selector_controller.h    | 2 +-
 apps/shared/Makefile                                          | 2 +-
 .../{cartesian_function.cpp => continuous_function.cpp}       | 2 +-
 apps/shared/{cartesian_function.h => continuous_function.h}   | 4 ++--
 apps/shared/global_context.cpp                                | 2 +-
 apps/variable_box_controller.cpp                              | 2 +-
 9 files changed, 10 insertions(+), 12 deletions(-)
 rename apps/shared/{cartesian_function.cpp => continuous_function.cpp} (99%)
 rename apps/shared/{cartesian_function.h => continuous_function.h} (98%)

diff --git a/apps/graph/continuous_function_store.h b/apps/graph/continuous_function_store.h
index 7a7beaf1b..263714709 100644
--- a/apps/graph/continuous_function_store.h
+++ b/apps/graph/continuous_function_store.h
@@ -1,10 +1,8 @@
 #ifndef GRAPH_CONTINUOUS_FUNCTION_STORE_H
 #define GRAPH_CONTINUOUS_FUNCTION_STORE_H
 
-#include "../shared/cartesian_function.h"
 #include "../shared/function_store.h"
-#include <stdint.h>
-#include <escher.h>
+#include "../shared/continuous_function.h"
 
 namespace Graph {
 
diff --git a/apps/graph/list/domain_parameter_controller.h b/apps/graph/list/domain_parameter_controller.h
index a5e0ee14f..a2d6852fc 100644
--- a/apps/graph/list/domain_parameter_controller.h
+++ b/apps/graph/list/domain_parameter_controller.h
@@ -3,7 +3,7 @@
 
 #include <escher/message_table_cell_with_expression.h>
 #include <ion/storage.h>
-#include "../../shared/cartesian_function.h"
+#include "../../shared/continuous_function.h"
 #include "../../shared/expiring_pointer.h"
 #include "../../shared/float_parameter_controller.h"
 
diff --git a/apps/graph/values/function_parameter_controller.h b/apps/graph/values/function_parameter_controller.h
index 8c349e6b7..18cc916cb 100644
--- a/apps/graph/values/function_parameter_controller.h
+++ b/apps/graph/values/function_parameter_controller.h
@@ -2,7 +2,7 @@
 #define GRAPH_FUNCTION_PARAM_CONTROLLER_H
 
 #include "../../shared/expiring_pointer.h"
-#include "../../shared/cartesian_function.h"
+#include "../../shared/continuous_function.h"
 #include "../../shared/values_function_parameter_controller.h"
 
 namespace Graph {
diff --git a/apps/graph/values/interval_parameter_selector_controller.h b/apps/graph/values/interval_parameter_selector_controller.h
index 8486abccb..eef6e1b6a 100644
--- a/apps/graph/values/interval_parameter_selector_controller.h
+++ b/apps/graph/values/interval_parameter_selector_controller.h
@@ -2,8 +2,8 @@
 #define GRAPH_INTERVAL_PARAMETER_SELECTOR_CONTROLLER
 
 #include <escher.h>
-#include "../../shared/cartesian_function.h"
 #include <apps/shared/interval_parameter_controller.h>
+#include "../../shared/continuous_function.h"
 
 namespace Graph {
 
diff --git a/apps/shared/Makefile b/apps/shared/Makefile
index 70ca29a36..d61914f8a 100644
--- a/apps/shared/Makefile
+++ b/apps/shared/Makefile
@@ -1,5 +1,5 @@
 app_shared_test_src = $(addprefix apps/shared/,\
-  cartesian_function.cpp\
+  continuous_function.cpp\
   curve_view_range.cpp \
   double_pair_store.cpp \
   expression_model.cpp \
diff --git a/apps/shared/cartesian_function.cpp b/apps/shared/continuous_function.cpp
similarity index 99%
rename from apps/shared/cartesian_function.cpp
rename to apps/shared/continuous_function.cpp
index eebc81473..6ce8aad6e 100644
--- a/apps/shared/cartesian_function.cpp
+++ b/apps/shared/continuous_function.cpp
@@ -1,4 +1,4 @@
-#include "cartesian_function.h"
+#include "continuous_function.h"
 #include "poincare_helpers.h"
 #include <apps/constant.h>
 #include <poincare/derivative.h>
diff --git a/apps/shared/cartesian_function.h b/apps/shared/continuous_function.h
similarity index 98%
rename from apps/shared/cartesian_function.h
rename to apps/shared/continuous_function.h
index 483463987..47dc04ddd 100644
--- a/apps/shared/cartesian_function.h
+++ b/apps/shared/continuous_function.h
@@ -1,5 +1,5 @@
-#ifndef SHARED_CARTESIAN_FUNCTION_H
-#define SHARED_CARTESIAN_FUNCTION_H
+#ifndef SHARED_CONTINUOUS_FUNCTION_H
+#define SHARED_CONTINUOUS_FUNCTION_H
 
 /* Although the considered functions are not generally continuous
  * mathematically speaking, the present class is named ContinuousFunction to
diff --git a/apps/shared/global_context.cpp b/apps/shared/global_context.cpp
index 5710ac8b4..0489debbb 100644
--- a/apps/shared/global_context.cpp
+++ b/apps/shared/global_context.cpp
@@ -1,5 +1,5 @@
 #include "global_context.h"
-#include "cartesian_function.h"
+#include "continuous_function.h"
 #include "poincare_helpers.h"
 #include <poincare/undefined.h>
 #include <assert.h>
diff --git a/apps/variable_box_controller.cpp b/apps/variable_box_controller.cpp
index 21d47c5dc..543629f0b 100644
--- a/apps/variable_box_controller.cpp
+++ b/apps/variable_box_controller.cpp
@@ -1,6 +1,6 @@
 #include "variable_box_controller.h"
 #include "shared/global_context.h"
-#include "shared/cartesian_function.h"
+#include "shared/continuous_function.h"
 #include <escher/metric.h>
 #include <ion/unicode/utf8_decoder.h>
 #include <poincare/layout_helper.h>