From 17ac54cad5f13b75aab5ed0f44fb6b2cdb5cd7ed Mon Sep 17 00:00:00 2001 From: Jacob Young Date: Thu, 5 Oct 2017 13:21:59 -0400 Subject: [PATCH] Use cmath in c++ files. --- apps/calculation/calculation.cpp | 2 +- apps/probability/calculation/calculation.cpp | 2 +- apps/sequence/local_context.cpp | 2 +- apps/shared/curve_view.h | 2 +- apps/shared/curve_view_cursor.cpp | 2 +- apps/shared/float_pair_store.cpp | 2 +- apps/shared/function.cpp | 2 +- apps/shared/function_graph_controller.cpp | 2 +- apps/shared/function_graph_view.cpp | 2 +- apps/shared/initialisation_parameter_controller.cpp | 2 +- apps/shared/interactive_curve_view_controller.cpp | 2 +- apps/shared/interactive_curve_view_range_delegate.cpp | 1 - apps/shared/memoized_curve_view_range.cpp | 1 - apps/shared/text_field_delegate_app.cpp | 2 +- apps/shared/zoom_parameter_controller.cpp | 2 +- apps/statistics/histogram_view.cpp | 2 +- kandinsky/src/line.cpp | 2 +- poincare/include/poincare/function.h | 2 +- poincare/src/complex.cpp | 1 - poincare/src/expression_lexer.l | 2 +- poincare/src/integer.cpp | 2 +- poincare/src/power.cpp | 1 - poincare/src/variable_context.cpp | 4 +--- 23 files changed, 19 insertions(+), 25 deletions(-) diff --git a/apps/calculation/calculation.cpp b/apps/calculation/calculation.cpp index 52feb88f1..fe8aed9e0 100644 --- a/apps/calculation/calculation.cpp +++ b/apps/calculation/calculation.cpp @@ -1,6 +1,6 @@ #include "calculation.h" #include -#include +#include using namespace Poincare; namespace Calculation { diff --git a/apps/probability/calculation/calculation.cpp b/apps/probability/calculation/calculation.cpp index 8e177aca7..69da88e76 100644 --- a/apps/probability/calculation/calculation.cpp +++ b/apps/probability/calculation/calculation.cpp @@ -1,6 +1,6 @@ #include "calculation.h" #include -#include +#include namespace Probability { diff --git a/apps/sequence/local_context.cpp b/apps/sequence/local_context.cpp index efd1791aa..6388c6a1f 100644 --- a/apps/sequence/local_context.cpp +++ b/apps/sequence/local_context.cpp @@ -1,5 +1,5 @@ #include "local_context.h" -#include +#include using namespace Poincare; diff --git a/apps/shared/curve_view.h b/apps/shared/curve_view.h index 0e7322034..3609392eb 100644 --- a/apps/shared/curve_view.h +++ b/apps/shared/curve_view.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include "curve_view_range.h" #include "curve_view_cursor.h" #include "banner_view.h" diff --git a/apps/shared/curve_view_cursor.cpp b/apps/shared/curve_view_cursor.cpp index d304e681f..8058acb88 100644 --- a/apps/shared/curve_view_cursor.cpp +++ b/apps/shared/curve_view_cursor.cpp @@ -1,5 +1,5 @@ #include "curve_view_cursor.h" -#include +#include namespace Shared { diff --git a/apps/shared/float_pair_store.cpp b/apps/shared/float_pair_store.cpp index f7a2c7e8d..817b444eb 100644 --- a/apps/shared/float_pair_store.cpp +++ b/apps/shared/float_pair_store.cpp @@ -1,5 +1,5 @@ #include "float_pair_store.h" -#include +#include #include #include #include diff --git a/apps/shared/function.cpp b/apps/shared/function.cpp index f54ed0abd..d2abd8eb6 100644 --- a/apps/shared/function.cpp +++ b/apps/shared/function.cpp @@ -1,6 +1,6 @@ #include "function.h" #include -#include +#include #include using namespace Poincare; diff --git a/apps/shared/function_graph_controller.cpp b/apps/shared/function_graph_controller.cpp index 335d63d5a..eda6d19b3 100644 --- a/apps/shared/function_graph_controller.cpp +++ b/apps/shared/function_graph_controller.cpp @@ -1,7 +1,7 @@ #include "function_graph_controller.h" #include "text_field_delegate_app.h" #include -#include +#include #include using namespace Poincare; diff --git a/apps/shared/function_graph_view.cpp b/apps/shared/function_graph_view.cpp index 1f5956493..47d7359eb 100644 --- a/apps/shared/function_graph_view.cpp +++ b/apps/shared/function_graph_view.cpp @@ -1,6 +1,6 @@ #include "function_graph_view.h" #include -#include +#include #include using namespace Poincare; diff --git a/apps/shared/initialisation_parameter_controller.cpp b/apps/shared/initialisation_parameter_controller.cpp index b066dd849..548cbacf7 100644 --- a/apps/shared/initialisation_parameter_controller.cpp +++ b/apps/shared/initialisation_parameter_controller.cpp @@ -1,6 +1,6 @@ #include "initialisation_parameter_controller.h" #include -#include +#include namespace Shared { diff --git a/apps/shared/interactive_curve_view_controller.cpp b/apps/shared/interactive_curve_view_controller.cpp index 25181ade5..6cf440b08 100644 --- a/apps/shared/interactive_curve_view_controller.cpp +++ b/apps/shared/interactive_curve_view_controller.cpp @@ -1,6 +1,6 @@ #include "interactive_curve_view_controller.h" #include "text_field_delegate_app.h" -#include +#include #include using namespace Poincare; diff --git a/apps/shared/interactive_curve_view_range_delegate.cpp b/apps/shared/interactive_curve_view_range_delegate.cpp index adc1addb4..46802886f 100644 --- a/apps/shared/interactive_curve_view_range_delegate.cpp +++ b/apps/shared/interactive_curve_view_range_delegate.cpp @@ -2,7 +2,6 @@ #include "interactive_curve_view_range.h" #include #include -#include namespace Shared { diff --git a/apps/shared/memoized_curve_view_range.cpp b/apps/shared/memoized_curve_view_range.cpp index 5234b4e6f..7e80aef5a 100644 --- a/apps/shared/memoized_curve_view_range.cpp +++ b/apps/shared/memoized_curve_view_range.cpp @@ -1,6 +1,5 @@ #include "memoized_curve_view_range.h" #include -#include #include #include diff --git a/apps/shared/text_field_delegate_app.cpp b/apps/shared/text_field_delegate_app.cpp index a92aefd48..d07e1f7d7 100644 --- a/apps/shared/text_field_delegate_app.cpp +++ b/apps/shared/text_field_delegate_app.cpp @@ -1,6 +1,6 @@ #include "text_field_delegate_app.h" #include "../apps_container.h" -#include +#include #include using namespace Poincare; diff --git a/apps/shared/zoom_parameter_controller.cpp b/apps/shared/zoom_parameter_controller.cpp index 761930834..149e1d8dc 100644 --- a/apps/shared/zoom_parameter_controller.cpp +++ b/apps/shared/zoom_parameter_controller.cpp @@ -1,6 +1,6 @@ #include "zoom_parameter_controller.h" #include -#include +#include namespace Shared { diff --git a/apps/statistics/histogram_view.cpp b/apps/statistics/histogram_view.cpp index 339e946cf..2782e5518 100644 --- a/apps/statistics/histogram_view.cpp +++ b/apps/statistics/histogram_view.cpp @@ -1,6 +1,6 @@ #include "histogram_view.h" #include -#include +#include using namespace Shared; diff --git a/kandinsky/src/line.cpp b/kandinsky/src/line.cpp index 6a6b728e1..f9b62b107 100644 --- a/kandinsky/src/line.cpp +++ b/kandinsky/src/line.cpp @@ -59,7 +59,7 @@ void KDDrawLine(KDPoint p1, KDPoint p2, KDColor c) { } } /* -#include +#include #include void KDDrawAntiAliasedLine(KDPoint p1, KDPoint p2, KDCoordinate width, KDColor frontColor, KDColor backColor) { diff --git a/poincare/include/poincare/function.h b/poincare/include/poincare/function.h index 97d65367b..d9b387c8f 100644 --- a/poincare/include/poincare/function.h +++ b/poincare/include/poincare/function.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include namespace Poincare { diff --git a/poincare/src/complex.cpp b/poincare/src/complex.cpp index b6184f495..7cad41caa 100644 --- a/poincare/src/complex.cpp +++ b/poincare/src/complex.cpp @@ -6,7 +6,6 @@ extern "C" { #include } #include -#include #include #include "layout/string_layout.h" #include "layout/baseline_relative_layout.h" diff --git a/poincare/src/expression_lexer.l b/poincare/src/expression_lexer.l index 8d637bdf3..302c9fd44 100644 --- a/poincare/src/expression_lexer.l +++ b/poincare/src/expression_lexer.l @@ -38,7 +38,7 @@ * which is not installed by default on MacOS, we thus made the choice to prefer * compatibility with MacOS's default version (2.3) instead of using the code * requires feature. */ -#include +#include #include #include "expression_parser.hpp" using namespace Poincare; diff --git a/poincare/src/integer.cpp b/poincare/src/integer.cpp index 69b7b2c2e..133ec3f49 100644 --- a/poincare/src/integer.cpp +++ b/poincare/src/integer.cpp @@ -3,8 +3,8 @@ extern "C" { #include #include #include -#include } +#include #include #include "layout/string_layout.h" diff --git a/poincare/src/power.cpp b/poincare/src/power.cpp index 2dd0f8f21..9855eebb4 100644 --- a/poincare/src/power.cpp +++ b/poincare/src/power.cpp @@ -3,7 +3,6 @@ extern "C" { #include } #include -#include #include #include #include diff --git a/poincare/src/variable_context.cpp b/poincare/src/variable_context.cpp index 7b9096054..ae6a58ad1 100644 --- a/poincare/src/variable_context.cpp +++ b/poincare/src/variable_context.cpp @@ -1,9 +1,7 @@ #include #include #include -extern "C" { -#include -} +#include namespace Poincare {