[apps\shared] Create a folder shared/

Change-Id: I94e4474ff5ab3bf9db7afd5b3be57b985755ecdf
2026-01-19 00:37:25 +01:00 · 2017-02-06 14:26:36 +01:00
parent 69e46f4958
commit b06c54856f
69 changed files with 106 additions and 103 deletions
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -4,42 +4,26 @@ include apps/home/Makefile
 include apps/probability/Makefile
 include apps/regression/Makefile
 include apps/settings/Makefile
+include apps/shared/Makefile
 include apps/statistics/Makefile
 #include apps/picview/Makefile

 app_objs += $(addprefix apps/,\
  apps_container.o\
  apps_window.o\
-  banner_view.o\
  battery_view.o\
  constant.o\
-  cursor_view.o\
-  curve_view.o\
-  curve_view_cursor.o\
-  curve_view_range.o\
-  editable_cell_table_view_controller.o\
-  expression_text_field_delegate.o\
-  float_pair_store.o\
-  float_parameter_controller.o\
-  interactive_curve_view_controller.o\
-  interactive_curve_view_range.o\
  main.o\
-  memoized_curve_view_range.o\
  node.o\
  node_list_view_controller.o\
  node_navigation_controller.o\
  preferences.o\
-  range_parameter_controller.o\
-  store_controller.o\
-  store_parameter_controller.o\
-  text_field_delegate_app.o\
  title_bar_view.o\
  toolbox_controller.o\
  toolbox_leaf_cell.o\
  toolbox_node.o\
  variable_box_controller.o\
  variable_box_leaf_cell.o\
-  zoom_parameter_controller.o\
 )

 # Tracking which source file uses which image is painful. But we need to ensure
--- a/apps/calculation/app.h
+++ b/apps/calculation/app.h
@@ -4,7 +4,7 @@
 #include "edit_expression_controller.h"
 #include "local_context.h"
 #include "history_controller.h"
-#include "../text_field_delegate_app.h"
+#include "../shared/text_field_delegate_app.h"
 #include <escher.h>

 namespace Calculation {
--- a/apps/graph/app.h
+++ b/apps/graph/app.h
@@ -7,7 +7,7 @@
 #include "graph/graph_controller.h"
 #include "list/list_controller.h"
 #include "values/values_controller.h"
-#include "../text_field_delegate_app.h"
+#include "../shared/text_field_delegate_app.h"

 namespace Graph {

--- a/apps/graph/graph/banner_view.h
+++ b/apps/graph/graph/banner_view.h
@@ -2,7 +2,7 @@
 #define GRAPH_BANNER_VIEW_H

 #include <escher.h>
-#include "../../banner_view.h"
+#include "../../shared/banner_view.h"

 namespace Graph {

--- a/apps/graph/graph/curve_parameter_controller.h
+++ b/apps/graph/graph/curve_parameter_controller.h
@@ -5,8 +5,8 @@
 #include "goto_parameter_controller.h"
 #include "banner_view.h"
 #include "../function.h"
-#include "../../curve_view_cursor.h"
-#include "../../interactive_curve_view_range.h"
+#include "../../shared/curve_view_cursor.h"
+#include "../../shared/interactive_curve_view_range.h"

 namespace Graph {

--- a/apps/graph/graph/goto_parameter_controller.h
+++ b/apps/graph/graph/goto_parameter_controller.h
@@ -3,9 +3,9 @@

 #include <escher.h>
 #include "graph_view.h"
-#include "../../float_parameter_controller.h"
-#include "../../curve_view_cursor.h"
-#include "../../interactive_curve_view_range.h"
+#include "../../shared/float_parameter_controller.h"
+#include "../../shared/curve_view_cursor.h"
+#include "../../shared/interactive_curve_view_range.h"

 namespace Graph {
 class GoToParameterController : public FloatParameterController {
--- a/apps/graph/graph/graph_controller.h
+++ b/apps/graph/graph/graph_controller.h
@@ -6,7 +6,7 @@
 #include "banner_view.h"
 #include "curve_parameter_controller.h"
 #include "initialisation_parameter_controller.h"
-#include "../../interactive_curve_view_controller.h"
+#include "../../shared/interactive_curve_view_controller.h"
 #include "../function_store.h"

 namespace Graph {
--- a/apps/graph/graph/graph_view.h
+++ b/apps/graph/graph/graph_view.h
@@ -2,10 +2,10 @@
 #define GRAPH_GRAPH_VIEW_H

 #include <escher.h>
-#include "../../curve_view.h"
+#include "../../shared/curve_view.h"
 #include "../../constant.h"
 #include "../function_store.h"
-#include "../../interactive_curve_view_range.h"
+#include "../../shared/interactive_curve_view_range.h"
 #include "../../preferences.h"

 namespace Graph {
--- a/apps/graph/graph/initialisation_parameter_controller.h
+++ b/apps/graph/graph/initialisation_parameter_controller.h
@@ -2,7 +2,7 @@
 #define GRAPH_GRAPH_INITIALISATION_PARAMETER_CONTROLLER_H

 #include <escher.h>
-#include "../../interactive_curve_view_range.h"
+#include "../../shared/interactive_curve_view_range.h"

 namespace Graph {

--- a/apps/graph/values/interval_parameter_controller.h
+++ b/apps/graph/values/interval_parameter_controller.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "interval.h"
-#include "../../float_parameter_controller.h"
+#include "../../shared/float_parameter_controller.h"

 namespace Graph {

--- a/apps/graph/values/values_controller.h
+++ b/apps/graph/values/values_controller.h
@@ -4,7 +4,7 @@
 #include <escher.h>
 #include "../function_store.h"
 #include "../function_title_cell.h"
-#include "../../editable_cell_table_view_controller.h"
+#include "../../shared/editable_cell_table_view_controller.h"
 #include "interval.h"
 #include "abscissa_parameter_controller.h"
 #include "derivative_parameter_controller.h"
--- a/apps/probability/app.h
+++ b/apps/probability/app.h
@@ -4,7 +4,7 @@
 #include <escher.h>
 #include <poincare.h>
 #include "law_controller.h"
-#include "../text_field_delegate_app.h"
+#include "../shared/text_field_delegate_app.h"

 namespace Probability {

--- a/apps/probability/law/law.h
+++ b/apps/probability/law/law.h
@@ -2,7 +2,7 @@
 #define PROBABILITE_LAW_H

 #include <poincare.h>
-#include "../../curve_view_range.h"
+#include "../../shared/curve_view_range.h"

 namespace Probability {

--- a/apps/probability/law_curve_view.h
+++ b/apps/probability/law_curve_view.h
@@ -1,7 +1,7 @@
 #ifndef PROBABILITY_LAW_CURVE_VIEW_H
 #define PROBABILITY_LAW_CURVE_VIEW_H

-#include "../curve_view.h"
+#include "../shared/curve_view.h"
 #include "../constant.h"
 #include "law/law.h"
 #include "calculation/calculation.h"
--- a/apps/probability/parameters_controller.h
+++ b/apps/probability/parameters_controller.h
@@ -2,7 +2,7 @@
 #define PROBABILITY_PARAMETERS_CONTROLLER_H

 #include <escher.h>
-#include "../float_parameter_controller.h"
+#include "../shared/float_parameter_controller.h"
 #include "law/law.h"
 #include "calculation_controller.h"

--- a/apps/regression/app.h
+++ b/apps/regression/app.h
@@ -2,7 +2,7 @@
 #define REGRESSION_APP_H

 #include <escher.h>
-#include "../text_field_delegate_app.h"
+#include "../shared/text_field_delegate_app.h"
 #include "store.h"
 #include "store_controller.h"
 #include "graph_controller.h"
--- a/apps/regression/banner_view.h
+++ b/apps/regression/banner_view.h
@@ -2,7 +2,7 @@
 #define REGRESSION_BANNER_VIEW_H

 #include <escher.h>
-#include "../banner_view.h"
+#include "../shared/banner_view.h"

 namespace Regression {

--- a/apps/regression/go_to_parameter_controller.h
+++ b/apps/regression/go_to_parameter_controller.h
@@ -2,8 +2,8 @@
 #define REGRESSION_GO_TO_PARAMETER_CONTROLLER_H

 #include <escher.h>
-#include "../float_parameter_controller.h"
-#include "../curve_view_cursor.h"
+#include "../shared/float_parameter_controller.h"
+#include "../shared/curve_view_cursor.h"
 #include "store.h"

 namespace Regression {
--- a/apps/regression/graph_controller.h
+++ b/apps/regression/graph_controller.h
@@ -7,7 +7,7 @@
 #include "graph_view.h"
 #include "initialisation_parameter_controller.h"
 #include "prediction_parameter_controller.h"
-#include "../interactive_curve_view_controller.h"
+#include "../shared/interactive_curve_view_controller.h"

 namespace Regression {

--- a/apps/regression/graph_view.h
+++ b/apps/regression/graph_view.h
@@ -4,7 +4,7 @@
 #include <escher.h>
 #include "store.h"
 #include "../constant.h"
-#include "../curve_view.h"
+#include "../shared/curve_view.h"

 namespace Regression {

--- a/apps/regression/prediction_parameter_controller.h
+++ b/apps/regression/prediction_parameter_controller.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "store.h"
-#include "../curve_view_cursor.h"
+#include "../shared/curve_view_cursor.h"
 #include "go_to_parameter_controller.h"

 namespace Regression {
--- a/apps/regression/store.h
+++ b/apps/regression/store.h
@@ -1,8 +1,8 @@
 #ifndef REGRESSION_STORE_H
 #define REGRESSION_STORE_H

-#include "../interactive_curve_view_range.h"
-#include "../float_pair_store.h"
+#include "../shared/interactive_curve_view_range.h"
+#include "../shared/float_pair_store.h"

 namespace Regression {

--- a/apps/regression/store_controller.h
+++ b/apps/regression/store_controller.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "store.h"
-#include "../store_controller.h"
+#include "../shared/store_controller.h"

 namespace Regression {

--- a/apps/shared/Makefile
+++ b/apps/shared/Makefile
@@ -0,0 +1,19 @@
+app_objs += $(addprefix apps/shared/,\
+  banner_view.o\
+  cursor_view.o\
+  curve_view.o\
+  curve_view_cursor.o\
+  curve_view_range.o\
+  editable_cell_table_view_controller.o\
+  expression_text_field_delegate.o\
+  float_pair_store.o\
+  float_parameter_controller.o\
+  interactive_curve_view_controller.o\
+  interactive_curve_view_range.o\
+  memoized_curve_view_range.o\
+  range_parameter_controller.o\
+  store_controller.o\
+  store_parameter_controller.o\
+  text_field_delegate_app.o\
+  zoom_parameter_controller.o\
+)
--- a/apps/shared/banner_view.cpp
+++ b/apps/shared/banner_view.cpp
--- a/apps/shared/banner_view.h
+++ b/apps/shared/banner_view.h
@@ -1,5 +1,5 @@
-#ifndef APPS_BANNER_VIEW_H
-#define APPS_BANNER_VIEW_H
+#ifndef SHARED_BANNER_VIEW_H
+#define SHARED_BANNER_VIEW_H

 #include <escher.h>

--- a/apps/shared/cursor_view.cpp
+++ b/apps/shared/cursor_view.cpp
--- a/apps/shared/cursor_view.h
+++ b/apps/shared/cursor_view.h
@@ -1,5 +1,5 @@
-#ifndef APPS_CURSOR_VIEW_H
-#define APPS_CURSOR_VIEW_H
+#ifndef SHARED_CURSOR_VIEW_H
+#define SHARED_CURSOR_VIEW_H

 #include <escher.h>

--- a/apps/shared/curve_view.cpp
+++ b/apps/shared/curve_view.cpp
@@ -1,5 +1,5 @@
 #include "curve_view.h"
-#include "constant.h"
+#include "../constant.h"
 #include <assert.h>
 #include <math.h>
 #include <float.h>
--- a/apps/shared/curve_view.h
+++ b/apps/shared/curve_view.h
@@ -1,5 +1,5 @@
-#ifndef APPS_CURVE_VIEW_H
-#define APPS_CURVE_VIEW_H
+#ifndef SHARED_CURVE_VIEW_H
+#define SHARED_CURVE_VIEW_H

 #include <escher.h>
 #include <poincare.h>
--- a/apps/shared/curve_view_cursor.cpp
+++ b/apps/shared/curve_view_cursor.cpp
--- a/apps/shared/curve_view_cursor.h
+++ b/apps/shared/curve_view_cursor.h
@@ -1,5 +1,5 @@
-#ifndef APPS_CURVE_VIEW_CURSOR_H
-#define APPS_CURVE_VIEW_CURSOR_H
+#ifndef SHARED_CURVE_VIEW_CURSOR_H
+#define SHARED_CURVE_VIEW_CURSOR_H


 class CurveViewCursor {
--- a/apps/shared/curve_view_range.cpp
+++ b/apps/shared/curve_view_range.cpp
--- a/apps/shared/curve_view_range.h
+++ b/apps/shared/curve_view_range.h
@@ -1,5 +1,5 @@
-#ifndef APPS_CURVE_VIEW_RANGE_H
-#define APPS_CURVE_VIEW_RANGE_H
+#ifndef SHARED_CURVE_VIEW_RANGE_H
+#define SHARED_CURVE_VIEW_RANGE_H

 #include <stdint.h>

--- a/apps/shared/editable_cell_table_view_controller.cpp
+++ b/apps/shared/editable_cell_table_view_controller.cpp
@@ -1,6 +1,6 @@
 #include "editable_cell_table_view_controller.h"
-#include "apps_container.h"
-#include "constant.h"
+#include "../apps_container.h"
+#include "../constant.h"
 #include "text_field_delegate_app.h"
 #include <assert.h>

--- a/apps/shared/editable_cell_table_view_controller.h
+++ b/apps/shared/editable_cell_table_view_controller.h
@@ -1,5 +1,5 @@
-#ifndef APPS_EDITABLE_CELL_TABLE_VIEW_CONTROLLER_H
-#define APPS_EDITABLE_CELL_TABLE_VIEW_CONTROLLER_H
+#ifndef SHARED_EDITABLE_CELL_TABLE_VIEW_CONTROLLER_H
+#define SHARED_EDITABLE_CELL_TABLE_VIEW_CONTROLLER_H

 #include <escher.h>
 #include <poincare.h>
--- a/apps/shared/expression_text_field_delegate.cpp
+++ b/apps/shared/expression_text_field_delegate.cpp
@@ -1,5 +1,5 @@
 #include "expression_text_field_delegate.h"
-#include "apps_container.h"
+#include "../apps_container.h"
 #include <math.h>
 #include <string.h>

--- a/apps/shared/expression_text_field_delegate.h
+++ b/apps/shared/expression_text_field_delegate.h
@@ -1,5 +1,5 @@
-#ifndef APPS_EXPRESSION_TEXT_FIELD_DELEGATE_H
-#define APPS_EXPRESSION_TEXT_FIELD_DELEGATE_H
+#ifndef SHARED_EXPRESSION_TEXT_FIELD_DELEGATE_H
+#define SHARED_EXPRESSION_TEXT_FIELD_DELEGATE_H

 #include <escher.h>
 #include <poincare.h>
--- a/apps/shared/float_pair_store.cpp
+++ b/apps/shared/float_pair_store.cpp
--- a/apps/shared/float_pair_store.h
+++ b/apps/shared/float_pair_store.h
@@ -1,5 +1,5 @@
-#ifndef APPS_FLOAT_PAIR_STORE_H
-#define APPS_FLOAT_PAIR_STORE_H
+#ifndef SHARED_FLOAT_PAIR_STORE_H
+#define SHARED_FLOAT_PAIR_STORE_H

 #include <stdint.h>

--- a/apps/shared/float_parameter_controller.cpp
+++ b/apps/shared/float_parameter_controller.cpp
@@ -1,6 +1,6 @@
 #include "float_parameter_controller.h"
-#include "constant.h"
-#include "apps_container.h"
+#include "../constant.h"
+#include "../apps_container.h"
 #include "text_field_delegate_app.h"
 #include <assert.h>

--- a/apps/shared/float_parameter_controller.h
+++ b/apps/shared/float_parameter_controller.h
@@ -1,5 +1,5 @@
-#ifndef APPS_FLOAT_PARAMETER_CONTROLLER_H
-#define APPS_FLOAT_PARAMETER_CONTROLLER_H
+#ifndef SHARED_FLOAT_PARAMETER_CONTROLLER_H
+#define SHARED_FLOAT_PARAMETER_CONTROLLER_H

 #include <escher.h>
 #include "expression_text_field_delegate.h"
--- a/apps/shared/interactive_curve_view_controller.cpp
+++ b/apps/shared/interactive_curve_view_controller.cpp
@@ -1,5 +1,5 @@
 #include "interactive_curve_view_controller.h"
-#include "apps_container.h"
+#include "../apps_container.h"
 #include <assert.h>
 #include <math.h>

--- a/apps/shared/interactive_curve_view_controller.h
+++ b/apps/shared/interactive_curve_view_controller.h
@@ -1,5 +1,5 @@
-#ifndef APPS_INTERACTIVE_CURVE_VIEW_CONTROLLER_H
-#define APPS_INTERACTIVE_CURVE_VIEW_CONTROLLER_H
+#ifndef SHARED_INTERACTIVE_CURVE_VIEW_CONTROLLER_H
+#define SHARED_INTERACTIVE_CURVE_VIEW_CONTROLLER_H

 #include <escher.h>
 #include "interactive_curve_view_range.h"
--- a/apps/shared/interactive_curve_view_range.cpp
+++ b/apps/shared/interactive_curve_view_range.cpp
--- a/apps/shared/interactive_curve_view_range.h
+++ b/apps/shared/interactive_curve_view_range.h
@@ -1,5 +1,5 @@
-#ifndef APPS_INTERACTIVE_CURVE_VIEW_RANGE_H
-#define APPS_INTERACTIVE_CURVE_VIEW_RANGE_H
+#ifndef SHARED_INTERACTIVE_CURVE_VIEW_RANGE_H
+#define SHARED_INTERACTIVE_CURVE_VIEW_RANGE_H

 #include <stdint.h>
 #include <poincare.h>
--- a/apps/shared/interactive_curve_view_range_delegate.h
+++ b/apps/shared/interactive_curve_view_range_delegate.h
@@ -1,5 +1,5 @@
-#ifndef APPS_INTERACTIVE_CURVE_VIEW_DELEGATE_H
-#define APPS_INTERACTIVE_CURVE_VIEW_DELEGATE_H
+#ifndef SHARED_INTERACTIVE_CURVE_VIEW_DELEGATE_H
+#define SHARED_INTERACTIVE_CURVE_VIEW_DELEGATE_H

 class InteractiveCurveViewRange;

--- a/apps/shared/memoized_curve_view_range.cpp
+++ b/apps/shared/memoized_curve_view_range.cpp
--- a/apps/shared/memoized_curve_view_range.h
+++ b/apps/shared/memoized_curve_view_range.h
@@ -1,5 +1,5 @@
-#ifndef APPS_MEMOIZED_CURVE_VIEW_RANGE_H
-#define APPS_MEMOIZED_CURVE_VIEW_RANGE_H
+#ifndef SHARED_MEMOIZED_CURVE_VIEW_RANGE_H
+#define SHARED_MEMOIZED_CURVE_VIEW_RANGE_H

 #include "curve_view_range.h"

--- a/apps/shared/range_parameter_controller.cpp
+++ b/apps/shared/range_parameter_controller.cpp
@@ -1,5 +1,5 @@
 #include "range_parameter_controller.h"
-#include "apps_container.h"
+#include "../apps_container.h"
 #include <assert.h>

 using namespace Poincare;
--- a/apps/shared/range_parameter_controller.h
+++ b/apps/shared/range_parameter_controller.h
@@ -1,5 +1,5 @@
-#ifndef APPS_RANGE_PARAMETER_CONTROLLER_H
-#define APPS_RANGE_PARAMETER_CONTROLLER_H
+#ifndef SHARED_RANGE_PARAMETER_CONTROLLER_H
+#define SHARED_RANGE_PARAMETER_CONTROLLER_H

 #include <escher.h>
 #include "interactive_curve_view_range.h"
--- a/apps/shared/store_controller.cpp
+++ b/apps/shared/store_controller.cpp
@@ -1,6 +1,6 @@
 #include "store_controller.h"
-#include "apps_container.h"
-#include "constant.h"
+#include "../apps_container.h"
+#include "../constant.h"
 #include <assert.h>

 using namespace Poincare;
--- a/apps/shared/store_controller.h
+++ b/apps/shared/store_controller.h
@@ -1,5 +1,5 @@
-#ifndef APPS_STORE_CONTROLLER_H
-#define APPS_STORE_CONTROLLER_H
+#ifndef SHARED_STORE_CONTROLLER_H
+#define SHARED_STORE_CONTROLLER_H

 #include <escher.h>
 #include "float_pair_store.h"
--- a/apps/shared/store_parameter_controller.cpp
+++ b/apps/shared/store_parameter_controller.cpp
--- a/apps/shared/store_parameter_controller.h
+++ b/apps/shared/store_parameter_controller.h
@@ -1,5 +1,5 @@
-#ifndef APPS_STORE_PARAM_CONTROLLER_H
-#define APPS_STORE_PARAM_CONTROLLER_H
+#ifndef SHARED_STORE_PARAM_CONTROLLER_H
+#define SHARED_STORE_PARAM_CONTROLLER_H

 #include <escher.h>
 #include "float_pair_store.h"
--- a/apps/shared/text_field_delegate_app.cpp
+++ b/apps/shared/text_field_delegate_app.cpp
@@ -1,5 +1,5 @@
 #include "text_field_delegate_app.h"
-#include "apps_container.h"
+#include "../apps_container.h"

 using namespace Poincare;

--- a/apps/shared/text_field_delegate_app.h
+++ b/apps/shared/text_field_delegate_app.h
@@ -1,5 +1,5 @@
-#ifndef APPS_TEXT_FIELD_DELEGATE_APP_H
-#define APPS_TEXT_FIELD_DELEGATE_APP_H
+#ifndef SHARED_TEXT_FIELD_DELEGATE_APP_H
+#define SHARED_TEXT_FIELD_DELEGATE_APP_H

 #include <escher.h>
 #include "expression_text_field_delegate.h"
--- a/apps/shared/zoom_parameter_controller.cpp
+++ b/apps/shared/zoom_parameter_controller.cpp
--- a/apps/shared/zoom_parameter_controller.h
+++ b/apps/shared/zoom_parameter_controller.h
@@ -1,5 +1,5 @@
-#ifndef APPS_ZOOM_PARAMETER_CONTROLLER_H
-#define APPS_ZOOM_PARAMETER_CONTROLLER_H
+#ifndef SHARED_ZOOM_PARAMETER_CONTROLLER_H
+#define SHARED_ZOOM_PARAMETER_CONTROLLER_H

 #include <escher.h>
 #include "interactive_curve_view_range.h"
--- a/apps/statistics/app.h
+++ b/apps/statistics/app.h
@@ -7,7 +7,7 @@
 #include "store.h"
 #include "store_controller.h"
 #include "histogram_controller.h"
-#include "../text_field_delegate_app.h"
+#include "../shared/text_field_delegate_app.h"

 namespace Statistics {

--- a/apps/statistics/box_banner_view.h
+++ b/apps/statistics/box_banner_view.h
@@ -2,7 +2,7 @@
 #define STATISTICS_BOX_BANNER_VIEW_H

 #include <escher.h>
-#include "../banner_view.h"
+#include "../shared/banner_view.h"

 namespace Statistics {

--- a/apps/statistics/box_range.h
+++ b/apps/statistics/box_range.h
@@ -1,7 +1,7 @@
 #ifndef STATISTICS_BOX_RANGE_H
 #define STATISTICS_BOX_RANGE_H

-#include "../curve_view_range.h"
+#include "../shared/curve_view_range.h"
 #include "store.h"

 namespace Statistics {
--- a/apps/statistics/box_view.h
+++ b/apps/statistics/box_view.h
@@ -5,7 +5,7 @@
 #include "store.h"
 #include "box_range.h"
 #include "../constant.h"
-#include "../curve_view.h"
+#include "../shared/curve_view.h"

 namespace Statistics {

--- a/apps/statistics/histogram_banner_view.h
+++ b/apps/statistics/histogram_banner_view.h
@@ -2,7 +2,7 @@
 #define STATISTICS_HISTOGRAM_BANNER_VIEW_H

 #include <escher.h>
-#include "../banner_view.h"
+#include "../shared/banner_view.h"

 namespace Statistics {

--- a/apps/statistics/histogram_controller.h
+++ b/apps/statistics/histogram_controller.h
@@ -6,7 +6,7 @@
 #include "histogram_view.h"
 #include "histogram_banner_view.h"
 #include "histogram_parameter_controller.h"
-#include "../curve_view.h"
+#include "../shared/curve_view.h"

 namespace Statistics {

--- a/apps/statistics/histogram_parameter_controller.h
+++ b/apps/statistics/histogram_parameter_controller.h
@@ -2,7 +2,7 @@
 #define STATISTICS_HISTOGRAM_PARAMETER_CONTROLLER_H

 #include <escher.h>
-#include "../float_parameter_controller.h"
+#include "../shared/float_parameter_controller.h"
 #include "store.h"

 namespace Statistics {
--- a/apps/statistics/histogram_view.h
+++ b/apps/statistics/histogram_view.h
@@ -4,7 +4,7 @@
 #include <escher.h>
 #include "store.h"
 #include "../constant.h"
-#include "../curve_view.h"
+#include "../shared/curve_view.h"

 namespace Statistics {

--- a/apps/statistics/store.h
+++ b/apps/statistics/store.h
@@ -1,8 +1,8 @@
 #ifndef STATISTICS_STORE_H
 #define STATISTICS_STORE_H

-#include "../memoized_curve_view_range.h"
-#include "../float_pair_store.h"
+#include "../shared/memoized_curve_view_range.h"
+#include "../shared/float_pair_store.h"

 namespace Statistics {

--- a/apps/statistics/store_controller.h
+++ b/apps/statistics/store_controller.h
@@ -3,7 +3,7 @@

 #include <escher.h>
 #include "store.h"
-#include "../store_controller.h"
+#include "../shared/store_controller.h"

 namespace Statistics {