[escher] Change name: pointer->message

Change-Id: I0bd7a7d8da047b03342bec1ff31f29ad7efcc2f6

apps/graph/graph/curve_parameter_controller.cpp

@@ -8,8 +8,8 @@ namespace Graph {
 CurveParameterController::CurveParameterController(InteractiveCurveViewRange * graphRange, BannerView * bannerView, CurveViewCursor * cursor) :
   FunctionCurveParameterController(graphRange, cursor, I18n::Message::X),
   m_bannerView(bannerView),
-  m_calculationCell(PointerTableCellWithChevron(I18n::Message::Compute)),
-  m_derivativeCell(PointerTableCellWithSwitch(I18n::Message::DerivateNumber))
+  m_calculationCell(MessageTableCellWithChevron(I18n::Message::Compute)),
+  m_derivativeCell(MessageTableCellWithSwitch(I18n::Message::DerivateNumber))
 {
 }
 

apps/graph/graph/curve_parameter_controller.h

@@ -18,8 +18,8 @@ public:
 private:
   BannerView * m_bannerView;
   constexpr static int k_totalNumberOfCells = 3;
-  PointerTableCellWithChevron m_calculationCell;
-  PointerTableCellWithSwitch m_derivativeCell;
+  MessageTableCellWithChevron m_calculationCell;
+  MessageTableCellWithSwitch m_derivativeCell;
 };
 
 }

apps/graph/values/derivative_parameter_controller.cpp

@@ -6,8 +6,8 @@ namespace Graph {
 
 DerivativeParameterController::DerivativeParameterController(ValuesController * valuesController) :
   ViewController(valuesController),
-  m_hideColumn(PointerTableCell(I18n::Message::HideDerivativeColumn)),
-  m_copyColumn(PointerTableCellWithChevron(I18n::Message::CopyColumnInList)),
+  m_hideColumn(MessageTableCell(I18n::Message::HideDerivativeColumn)),
+  m_copyColumn(MessageTableCellWithChevron(I18n::Message::CopyColumnInList)),
   m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin,
     Metric::CommonBottomMargin, Metric::CommonLeftMargin)),
   m_function(nullptr),

apps/graph/values/derivative_parameter_controller.h

@@ -26,8 +26,8 @@ private:
   constexpr static int k_totalNumberOfCell = 2;
   constexpr static int k_maxNumberOfCharsInTitle = 16;
   char m_pageTitle[k_maxNumberOfCharsInTitle];
-  PointerTableCell m_hideColumn;
-  PointerTableCellWithChevron m_copyColumn;
+  MessageTableCell m_hideColumn;
+  MessageTableCellWithChevron m_copyColumn;
   SelectableTableView m_selectableTableView;
   CartesianFunction * m_function;
   ValuesController * m_valuesController;

apps/graph/values/function_parameter_controller.cpp

@@ -8,7 +8,7 @@ namespace Graph {
 
 FunctionParameterController::FunctionParameterController(ValuesController * valuesController) :
   ValuesFunctionParameterController('x'),
-  m_displayDerivativeColumn(PointerTableCellWithSwitch(I18n::Message::DerivativeFunctionColumn)),
+  m_displayDerivativeColumn(MessageTableCellWithSwitch(I18n::Message::DerivativeFunctionColumn)),
   m_cartesianFunction(nullptr),
   m_valuesController(valuesController)
 {

apps/graph/values/function_parameter_controller.h

@@ -19,7 +19,7 @@ public:
   void setFunction(Shared::Function * function) override;
 private:
   constexpr static int k_totalNumberOfCell = 2;
-  PointerTableCellWithSwitch m_displayDerivativeColumn;
+  MessageTableCellWithSwitch m_displayDerivativeColumn;
   CartesianFunction * m_cartesianFunction;
   ValuesController * m_valuesController;
 };

apps/graph/values/values_controller.cpp

@@ -38,7 +38,7 @@ void ValuesController::willDisplayCellAtLocation(HighlightCell * cell, int i, in
   Shared::ValuesController::willDisplayCellAtLocation(cell, i, j);
   // The cell is the abscissa title cell:
   if (j == 0 && i == 0) {
-    EvenOddPointerTextCell * mytitleCell = (EvenOddPointerTextCell *)cell;
+    EvenOddMessageTextCell * mytitleCell = (EvenOddMessageTextCell *)cell;
     mytitleCell->setMessage(I18n::Message::X);
     return;
   }

apps/home/app_cell.cpp

@@ -5,7 +5,7 @@ namespace Home {
 
 AppCell::AppCell() :
   HighlightCell(),
-  m_nameView(PointerTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, KDColorWhite)),
+  m_nameView(MessageTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, KDColorWhite)),
   m_visible(true)
 {
 }

apps/home/app_cell.h

@@ -23,7 +23,7 @@ private:
   static constexpr KDCoordinate k_nameWidthMargin = 4;
   static constexpr KDCoordinate k_nameHeightMargin = 2;
   ImageView m_iconView;
-  PointerTextView m_nameView;
+  MessageTextView m_nameView;
   bool m_visible;
 };
 

apps/math_toolbox.cpp

@@ -154,13 +154,13 @@ int MathToolbox::reusableCellCount(int type) {
 void MathToolbox::willDisplayCellForIndex(HighlightCell * cell, int index) {
   ToolboxNode * node = (ToolboxNode *)m_nodeModel->children(index);
   if (node->numberOfChildren() == 0) {
-    PointerTableCellWithPointer * myCell = (PointerTableCellWithPointer *)cell;
+    MessageTableCellWithMessage * myCell = (MessageTableCellWithMessage *)cell;
     myCell->setMessage(node->label());
     myCell->setAccessoryMessage(node->text());
     myCell->setAccessoryTextColor(Palette::GreyDark);
     return;
   }
-  PointerTableCell * myCell = (PointerTableCell *)cell;
+  MessageTableCell * myCell = (MessageTableCell *)cell;
   myCell->setMessage(node->label());
 }
 

apps/math_toolbox.h

@@ -71,8 +71,8 @@ private:
   bool selectSubMenu(ToolboxNode * selectedNode);
   bool returnToPreviousMenu();
   Stack m_stack;
-  PointerTableCellWithPointer m_leafCells[k_maxNumberOfDisplayedRows];
-  PointerTableCellWithChevron m_nodeCells[k_maxNumberOfDisplayedRows];
+  MessageTableCellWithMessage m_leafCells[k_maxNumberOfDisplayedRows];
+  MessageTableCellWithChevron m_nodeCells[k_maxNumberOfDisplayedRows];
   ListController m_listController;
   ToolboxNode * m_nodeModel;
 };

apps/probability/calculation_controller.cpp

@@ -12,7 +12,7 @@ using namespace Shared;
 namespace Probability {
 
 CalculationController::ContentView::ContentView(Responder * parentResponder, CalculationController * calculationController, Calculation * calculation) :
-  m_titleView(PointerTextView(KDText::FontSize::Small, I18n::Message::ComputeProbability, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen)),
+  m_titleView(MessageTextView(KDText::FontSize::Small, I18n::Message::ComputeProbability, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen)),
   m_lawCurveView(LawCurveView()),
   m_imageTableView(ImageTableView(parentResponder, calculation, calculationController)),
   m_calculationCell{EditableTextCell(parentResponder, calculationController, m_draftTextBuffer),

apps/probability/calculation_controller.h

@@ -44,10 +44,10 @@ private:
     constexpr static KDCoordinate k_titleHeightMargin = 5;
     int numberOfSubviews() const override;
     View * subviewAtIndex(int index) override;
-    PointerTextView m_titleView;
+    MessageTextView m_titleView;
     LawCurveView m_lawCurveView;
     ImageTableView m_imageTableView;
-    PointerTextView m_text[k_maxNumberOfEditableFields];
+    MessageTextView m_text[k_maxNumberOfEditableFields];
     char m_draftTextBuffer[EditableTextCell::k_bufferLength];
     EditableTextCell m_calculationCell[k_maxNumberOfEditableFields];
     Calculation * m_calculation;

apps/probability/cell.cpp

@@ -5,7 +5,7 @@ namespace Probability {
 
 Cell::Cell() :
   HighlightCell(),
-  m_labelView(PointerTextView(KDText::FontSize::Large, (I18n::Message)0, 0, 0.5, KDColorBlack, KDColorWhite))
+  m_labelView(MessageTextView(KDText::FontSize::Large, (I18n::Message)0, 0, 0.5, KDColorBlack, KDColorWhite))
 {
 }
 

apps/probability/cell.h

@@ -20,7 +20,7 @@ private:
   int numberOfSubviews() const override;
   View * subviewAtIndex(int index) override;
   void layoutSubviews() override;
-  PointerTextView m_labelView;
+  MessageTextView m_labelView;
   ImageView m_iconView;
   /* TODO: One day, we would rather store a mask (8bits/pixel) instead of two
    * images (16bits/pixels)*/

apps/probability/law_controller.cpp

@@ -20,7 +20,7 @@
 namespace Probability {
 
 LawController::ContentView::ContentView(SelectableTableView * selectableTableView) :
-  m_titleView(PointerTextView(KDText::FontSize::Small, I18n::Message::ChooseLaw, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen)),
+  m_titleView(MessageTextView(KDText::FontSize::Small, I18n::Message::ChooseLaw, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen)),
   m_selectableTableView(selectableTableView)
 {
 }

apps/probability/law_controller.h

@@ -29,7 +29,7 @@ private:
     int numberOfSubviews() const override;
     View * subviewAtIndex(int index) override;
     void layoutSubviews() override;
-    PointerTextView m_titleView;;
+    MessageTextView m_titleView;;
     SelectableTableView * m_selectableTableView;
   };
   void setLawAccordingToIndex(int index);

apps/probability/parameters_controller.cpp

@@ -8,9 +8,9 @@ namespace Probability {
 
 ParametersController::ContentView::ContentView(Responder * parentResponder, SelectableTableView * selectableTableView) :
   m_numberOfParameters(1),
-  m_titleView(PointerTextView(KDText::FontSize::Small, I18n::Message::ChooseParameters, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen)),
-  m_firstParameterDefinition(PointerTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen)),
-  m_secondParameterDefinition(PointerTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen)),
+  m_titleView(MessageTextView(KDText::FontSize::Small, I18n::Message::ChooseParameters, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen)),
+  m_firstParameterDefinition(MessageTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen)),
+  m_secondParameterDefinition(MessageTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen)),
   m_selectableTableView(selectableTableView)
 {
 }
@@ -20,7 +20,7 @@ void ParametersController::ContentView::drawRect(KDContext * ctx, KDRect rect) c
   ctx->fillRect(KDRect(0, tableHeight, bounds().width(), bounds().height() - tableHeight), Palette::WallScreen);
 }
 
-PointerTextView * ParametersController::ContentView::parameterDefinitionAtIndex(int index) {
+MessageTextView * ParametersController::ContentView::parameterDefinitionAtIndex(int index) {
   assert(index >= 0 && index < 2);
   if (index == 0) {
     return &m_firstParameterDefinition;
@@ -69,8 +69,8 @@ void ParametersController::ContentView::layoutSubviews() {
 
 ParametersController::ParametersController(Responder * parentResponder) :
   FloatParameterController(parentResponder, I18n::Message::Next),
-  m_menuListCell{PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer),
-    PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer)},
+  m_menuListCell{MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer),
+    MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer)},
   m_contentView(ContentView(this, &m_selectableTableView)),
   m_law(nullptr),
   m_calculationController(CalculationController(nullptr))
@@ -113,7 +113,7 @@ void ParametersController::willDisplayCellForIndex(HighlightCell * cell, int ind
   if (index == numberOfRows()-1) {
     return;
   }
-  PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *) cell;
+  MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *) cell;
   myCell->setMessage(m_law->parameterNameAtIndex(index));
   FloatParameterController::willDisplayCellForIndex(cell, index);
 }

apps/probability/parameters_controller.h

@@ -28,7 +28,7 @@ private:
   public:
     ContentView(Responder * parentResponder, SelectableTableView * selectableTableView);
     void drawRect(KDContext * ctx, KDRect rect) const override;
-    PointerTextView * parameterDefinitionAtIndex(int index);
+    MessageTextView * parameterDefinitionAtIndex(int index);
     void layoutSubviews() override;
     void setNumberOfParameters(int numberOfParameters);
   private:
@@ -37,14 +37,14 @@ private:
     int numberOfSubviews() const override;
     View * subviewAtIndex(int index) override;
     int m_numberOfParameters;
-    PointerTextView m_titleView;
-    PointerTextView m_firstParameterDefinition;
-    PointerTextView m_secondParameterDefinition;
+    MessageTextView m_titleView;
+    MessageTextView m_firstParameterDefinition;
+    MessageTextView m_secondParameterDefinition;
     SelectableTableView * m_selectableTableView;
   };
   constexpr static int k_maxNumberOfCells = 2;
-  char m_draftTextBuffer[PointerTableCellWithEditableText::k_bufferLength];
-  PointerTableCellWithEditableText m_menuListCell[k_maxNumberOfCells];
+  char m_draftTextBuffer[MessageTableCellWithEditableText::k_bufferLength];
+  MessageTableCellWithEditableText m_menuListCell[k_maxNumberOfCells];
   float m_previousParameters[k_maxNumberOfCells];
   ContentView m_contentView;
   Law * m_law;

apps/regression/banner_view.cpp

@@ -20,9 +20,9 @@ TextView * BannerView::textViewAtIndex(int i) const {
   return (TextView *)textViews[i];
 }
 
-PointerTextView * BannerView::pointerTextViewAtIndex(int i) const {
+MessageTextView * BannerView::messageTextViewAtIndex(int i) const {
   if (i == 0) {
-    return (PointerTextView *)&m_regressionTypeView;
+    return (MessageTextView *)&m_regressionTypeView;
   }
   return nullptr;
 }

apps/regression/banner_view.h

@@ -12,8 +12,8 @@ public:
 private:
   int numberOfSubviews() const override;
   TextView * textViewAtIndex(int i) const override;
-  PointerTextView * pointerTextViewAtIndex(int i) const override;
-  PointerTextView m_regressionTypeView;
+  MessageTextView * messageTextViewAtIndex(int i) const override;
+  MessageTextView m_regressionTypeView;
   BufferTextView m_slopeView;
   BufferTextView m_yInterceptView;
   BufferTextView m_xView;

apps/regression/calculation_controller.cpp

@@ -14,8 +14,8 @@ namespace Regression {
 CalculationController::CalculationController(Responder * parentResponder, ButtonRowController * header, Store * store) :
   TabTableController(parentResponder, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin, this, true),
   ButtonRowDelegate(header, nullptr),
-  m_titleCells{EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small),
-    EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small)},
+  m_titleCells{EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small),
+    EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small)},
   m_r2TitleCell(1.0f, 0.5f),
   m_columnTitleCell(EvenOddDoubleBufferTextCell(&m_selectableTableView)),
   m_calculationCells{EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small)},
@@ -131,7 +131,7 @@ void CalculationController::willDisplayCellAtLocation(HighlightCell * cell, int
       myCell->setExpression(m_r2Layout);
       return;
     }
-    EvenOddPointerTextCell * myCell = (EvenOddPointerTextCell *)cell;
+    EvenOddMessageTextCell * myCell = (EvenOddMessageTextCell *)cell;
     if (j == 0) {
       myCell->setMessage(I18n::Message::Default);
       return;

apps/regression/calculation_controller.h

@@ -37,7 +37,7 @@ private:
   constexpr static int k_maxNumberOfDisplayableRows = 10;
   static constexpr KDCoordinate k_cellHeight = 25;
   static constexpr KDCoordinate k_cellWidth = Ion::Display::Width/2 - Metric::CommonRightMargin/2 - Metric::CommonLeftMargin/2;
-  EvenOddPointerTextCell m_titleCells[k_maxNumberOfDisplayableRows];
+  EvenOddMessageTextCell m_titleCells[k_maxNumberOfDisplayableRows];
   EvenOddExpressionCell m_r2TitleCell;
   Poincare::ExpressionLayout * m_r2Layout;
   EvenOddDoubleBufferTextCell m_columnTitleCell;

apps/regression/go_to_parameter_controller.cpp

@@ -9,7 +9,7 @@ namespace Regression {
 
 GoToParameterController::GoToParameterController(Responder * parentResponder, Store * store, CurveViewCursor * cursor) :
   FloatParameterController(parentResponder),
-  m_abscisseCell(PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer)),
+  m_abscisseCell(MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer)),
   m_store(store),
   m_cursor(cursor),
   m_xPrediction(true)
@@ -75,7 +75,7 @@ void GoToParameterController::willDisplayCellForIndex(HighlightCell * cell, int
   if (index == numberOfRows()-1) {
     return;
   }
-  PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *) cell;
+  MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *) cell;
   if (m_xPrediction) {
     myCell->setMessage(I18n::Message::X);
   } else {

apps/regression/go_to_parameter_controller.h

@@ -24,8 +24,8 @@ private:
   float parameterAtIndex(int index) override;
   void setParameterAtIndex(int parameterIndex, float f) override;
   void buttonAction() override;
-  char m_draftTextBuffer[PointerTableCellWithEditableText::k_bufferLength];
-  PointerTableCellWithEditableText m_abscisseCell;
+  char m_draftTextBuffer[MessageTableCellWithEditableText::k_bufferLength];
+  MessageTableCellWithEditableText m_abscisseCell;
   float m_previousParameter;
   Store * m_store;
   Shared::CurveViewCursor * m_cursor;

apps/regression/initialisation_parameter_controller.cpp

@@ -59,7 +59,7 @@ KDCoordinate InitialisationParameterController::cellHeight() {
 }
 
 void InitialisationParameterController::willDisplayCellForIndex(HighlightCell * cell, int index) {
-  PointerTableCell * myCell = (PointerTableCell *)cell;
+  MessageTableCell * myCell = (MessageTableCell *)cell;
   I18n::Message titles[3] = {I18n::Message::RoundAbscissa, I18n::Message::Orthonormal, I18n::Message::DefaultSetting};
   myCell->setMessage(titles[index]);
 }

apps/regression/initialisation_parameter_controller.h

@@ -21,7 +21,7 @@ public:
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
 private:
   constexpr static int k_totalNumberOfCells = 3;
-  PointerTableCell m_cells[k_totalNumberOfCells];
+  MessageTableCell m_cells[k_totalNumberOfCells];
   SelectableTableView m_selectableTableView;
   Store * m_store;
 };

apps/regression/prediction_parameter_controller.cpp

@@ -55,7 +55,7 @@ KDCoordinate PredictionParameterController::cellHeight() {
 }
 
 void PredictionParameterController::willDisplayCellForIndex(HighlightCell * cell, int index) {
-  PointerTableCellWithChevron * myCell = (PointerTableCellWithChevron *)cell;
+  MessageTableCellWithChevron * myCell = (MessageTableCellWithChevron *)cell;
   I18n::Message  titles[2] = {I18n::Message::XPrediction, I18n::Message::YPrediction};
   myCell->setMessage(titles[index]);
 }

apps/regression/prediction_parameter_controller.h

@@ -22,7 +22,7 @@ public:
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
 private:
   constexpr static int k_totalNumberOfCells = 2;
-  PointerTableCellWithChevron m_cells[2];
+  MessageTableCellWithChevron m_cells[2];
   SelectableTableView m_selectableTableView;
   GoToParameterController m_goToParameterController;
 };

apps/sequence/graph/curve_parameter_controller.cpp

@@ -8,7 +8,7 @@ namespace Sequence {
 
 CurveParameterController::CurveParameterController(GraphController * graphController, InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor) :
   FunctionCurveParameterController(graphRange, cursor, I18n::Message::N),
-  m_sumCell(PointerTableCell(I18n::Message::TermSum)),
+  m_sumCell(MessageTableCell(I18n::Message::TermSum)),
   m_graphController(graphController)
 {
 }

apps/sequence/graph/curve_parameter_controller.h

@@ -18,7 +18,7 @@ public:
   int reusableCellCount() override;
 private:
   constexpr static int k_totalNumberOfCells = 2;
-  PointerTableCell m_sumCell;
+  MessageTableCell m_sumCell;
   GraphController * m_graphController;
 };
 

apps/sequence/graph/term_sum_controller.cpp

@@ -174,7 +174,7 @@ View * TermSumController::ContentView::subviewAtIndex(int index) {
 TermSumController::ContentView::LegendView::LegendView() :
   m_sum(ExpressionView(0.0f, 0.5f, KDColorBlack, Palette::GreyBright)),
   m_sumLayout(nullptr),
-  m_legend(PointerTextView(KDText::FontSize::Small, I18n::Message::Default, 0.0f, 0.5f, KDColorBlack, Palette::GreyBright))
+  m_legend(MessageTextView(KDText::FontSize::Small, I18n::Message::Default, 0.0f, 0.5f, KDColorBlack, Palette::GreyBright))
 {
 }
 

apps/sequence/graph/term_sum_controller.h

@@ -40,7 +40,7 @@ private:
       View * subviewAtIndex(int index) override;
       ExpressionView m_sum;
       Poincare::ExpressionLayout * m_sumLayout;
-      PointerTextView m_legend;
+      MessageTextView m_legend;
     };
     ContentView(GraphView * graphView);
     void layoutSubviews() override;

apps/sequence/list/list_parameter_controller.cpp

@@ -8,7 +8,7 @@ namespace Sequence {
 
 ListParameterController::ListParameterController(ListController * listController, SequenceStore * sequenceStore) :
   Shared::ListParameterController(listController, sequenceStore, I18n::Message::SequenceColor, I18n::Message::DeleteSequence),
-  m_typeCell(PointerTableCellWithChevronAndExpression(I18n::Message::SequenceType)),
+  m_typeCell(MessageTableCellWithChevronAndExpression(I18n::Message::SequenceType)),
   m_typeParameterController(TypeParameterController(this, sequenceStore, listController, TableCell::Layout::Horizontal, Metric::CommonTopMargin, Metric::CommonRightMargin,
     Metric::CommonBottomMargin, Metric::CommonLeftMargin))
 {

apps/sequence/list/list_parameter_controller.h

@@ -22,7 +22,7 @@ public:
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
 private:
   constexpr static int k_totalNumberOfCell = 4;
-  PointerTableCellWithChevronAndExpression m_typeCell;
+  MessageTableCellWithChevronAndExpression m_typeCell;
   TypeParameterController m_typeParameterController;
   Sequence * m_sequence;
 };

apps/sequence/values/values_controller.cpp

@@ -22,7 +22,7 @@ void ValuesController::willDisplayCellAtLocation(HighlightCell * cell, int i, in
   Shared::ValuesController::willDisplayCellAtLocation(cell, i, j);
   // The cell is the abscissa title cell:
   if (j == 0 && i == 0) {
-    EvenOddPointerTextCell * mytitleCell = (EvenOddPointerTextCell *)cell;
+    EvenOddMessageTextCell * mytitleCell = (EvenOddMessageTextCell *)cell;
     mytitleCell->setMessage(I18n::Message::N);
     return;
   }

apps/settings/main_controller.cpp

@@ -20,9 +20,9 @@ const SettingsNode model = SettingsNode(I18n::Message::SettingsApp, menu, 4);
 
 MainController::MainController(Responder * parentResponder) :
   ViewController(parentResponder),
-  m_cells{PointerTableCellWithChevronAndPointer(KDText::FontSize::Large, KDText::FontSize::Small),
-    PointerTableCellWithChevronAndPointer(KDText::FontSize::Large, KDText::FontSize::Small), PointerTableCellWithChevronAndPointer(KDText::FontSize::Large, KDText::FontSize::Small)},
-  m_complexFormatCell(PointerTableCellWithChevronAndExpression(I18n::Message::Default, KDText::FontSize::Large)),
+  m_cells{MessageTableCellWithChevronAndMessage(KDText::FontSize::Large, KDText::FontSize::Small),
+    MessageTableCellWithChevronAndMessage(KDText::FontSize::Large, KDText::FontSize::Small), MessageTableCellWithChevronAndMessage(KDText::FontSize::Large, KDText::FontSize::Small)},
+  m_complexFormatCell(MessageTableCellWithChevronAndExpression(I18n::Message::Default, KDText::FontSize::Large)),
   m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin,
     Metric::CommonBottomMargin, Metric::CommonLeftMargin)),
   m_nodeModel((Node *)&model),
@@ -102,7 +102,7 @@ int MainController::typeAtLocation(int i, int j) {
 }
 
 void MainController::willDisplayCellForIndex(HighlightCell * cell, int index) {
-  PointerTableCell * myCell = (PointerTableCell *)cell;
+  MessageTableCell * myCell = (MessageTableCell *)cell;
   myCell->setMessage(m_nodeModel->children(index)->label());
 
   if (index == 2) {
@@ -118,11 +118,11 @@ void MainController::willDisplayCellForIndex(HighlightCell * cell, int index) {
       const char superscrit[4] = {Ion::Charset::IComplex, Ion::Charset::SmallTheta, ' ', 0};
       m_complexFormatLayout = new BaselineRelativeLayout(new StringLayout(base, 4, KDText::FontSize::Small), new StringLayout(superscrit, 3, KDText::FontSize::Small), BaselineRelativeLayout::Type::Superscript);
     }
-    PointerTableCellWithChevronAndExpression * myExpCell = (PointerTableCellWithChevronAndExpression *)cell;
+    MessageTableCellWithChevronAndExpression * myExpCell = (MessageTableCellWithChevronAndExpression *)cell;
     myExpCell->setExpression(m_complexFormatLayout);
     return;
   }
-  PointerTableCellWithChevronAndPointer * myTextCell = (PointerTableCellWithChevronAndPointer *)cell;
+  MessageTableCellWithChevronAndMessage * myTextCell = (MessageTableCellWithChevronAndMessage *)cell;
   switch (index) {
     case 0:
       myTextCell->setSubtitle(m_nodeModel->children(index)->children((int)Preferences::sharedPreferences()->angleUnit())->label());

apps/settings/main_controller.h

@@ -27,8 +27,8 @@ public:
 private:
   StackViewController * stackController() const;
   constexpr static int k_totalNumberOfCell = 4;
-  PointerTableCellWithChevronAndPointer m_cells[k_totalNumberOfCell-1];
-  PointerTableCellWithChevronAndExpression m_complexFormatCell;
+  MessageTableCellWithChevronAndMessage m_cells[k_totalNumberOfCell-1];
+  MessageTableCellWithChevronAndExpression m_complexFormatCell;
   Poincare::ExpressionLayout * m_complexFormatLayout;
   SelectableTableView m_selectableTableView;
   Node * m_nodeModel;

apps/settings/sub_controller.cpp

@@ -11,8 +11,8 @@ namespace Settings {
 
 SubController::SubController(Responder * parentResponder) :
   ViewController(parentResponder),
-  m_cells{PointerTableCell(I18n::Message::Default, KDText::FontSize::Large), PointerTableCell(I18n::Message::Default, KDText::FontSize::Large),
-    PointerTableCell(I18n::Message::Default, KDText::FontSize::Large)},
+  m_cells{MessageTableCell(I18n::Message::Default, KDText::FontSize::Large), MessageTableCell(I18n::Message::Default, KDText::FontSize::Large),
+    MessageTableCell(I18n::Message::Default, KDText::FontSize::Large)},
   m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin,
     Metric::CommonBottomMargin, Metric::CommonLeftMargin)),
   m_nodeModel(nullptr),
@@ -96,7 +96,7 @@ void SubController::willDisplayCellForIndex(HighlightCell * cell, int index) {
   if (m_preferenceIndex == 2) {
     return;
   }
-  PointerTableCell * myCell = (PointerTableCell *)cell;
+  MessageTableCell * myCell = (MessageTableCell *)cell;
   myCell->setMessage(m_nodeModel->children(index)->label());
 }
 

apps/settings/sub_controller.h

@@ -27,7 +27,7 @@ private:
   void setPreferenceAtIndexWithValueIndex(int preferenceIndex, int valueIndex);
   int valueIndexAtPreferenceIndex(int preferenceIndex);
   constexpr static int k_totalNumberOfCell = 3;
-  PointerTableCell m_cells[k_totalNumberOfCell];
+  MessageTableCell m_cells[k_totalNumberOfCell];
   ExpressionTableCell m_complexFormatCells[2];
   Poincare::ExpressionLayout * m_complexFormatLayout[2];
   SelectableTableView m_selectableTableView;

apps/shared/banner_view.cpp

@@ -16,7 +16,7 @@ void BannerView::setLegendAtIndex(char * text, int index) {
 }
 
 void BannerView::setMessageAtIndex(I18n::Message text, int index) {
-  PointerTextView * textView = pointerTextViewAtIndex(index);
+  MessageTextView * textView = messageTextViewAtIndex(index);
   textView->setMessage(text);
   layoutSubviews();
 }
@@ -92,7 +92,7 @@ int BannerView::numberOfLines() const {
   return lineNumber+1;
 }
 
-PointerTextView * BannerView::pointerTextViewAtIndex(int i) const {
+MessageTextView * BannerView::messageTextViewAtIndex(int i) const {
   return nullptr;
 }
 

apps/shared/banner_view.h

@@ -16,7 +16,7 @@ private:
   void layoutSubviews() override;
   int numberOfLines() const;
   virtual TextView * textViewAtIndex(int i) const = 0;
-  virtual PointerTextView * pointerTextViewAtIndex(int i) const;
+  virtual MessageTextView * messageTextViewAtIndex(int i) const;
 };
 
 }

apps/shared/button_with_separator.cpp

@@ -23,5 +23,5 @@ void ButtonWithSeparator::drawRect(KDContext * ctx, KDRect rect) const {
 void ButtonWithSeparator::layoutSubviews() {
   KDCoordinate width = bounds().width();
   KDCoordinate height = bounds().height();
-  m_pointerTextView.setFrame(KDRect(k_lineThickness, k_margin + k_lineThickness, width-2*k_lineThickness, height - 4*k_lineThickness-k_margin));
+  m_messageTextView.setFrame(KDRect(k_lineThickness, k_margin + k_lineThickness, width-2*k_lineThickness, height - 4*k_lineThickness-k_margin));
 }

apps/shared/float_parameter_controller.cpp

@@ -89,7 +89,7 @@ void FloatParameterController::willDisplayCellForIndex(HighlightCell * cell, int
   if (index == numberOfRows()-1) {
     return;
   }
-  PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *) cell;
+  MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *) cell;
   char buffer[Complex::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits)];
   Complex::convertFloatToText(parameterAtIndex(index), buffer, Complex::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits), Constant::LargeNumberOfSignificantDigits, Expression::FloatDisplayMode::Decimal);
   myCell->setAccessoryText(buffer);
@@ -112,7 +112,7 @@ bool FloatParameterController::textFieldDidFinishEditing(TextField * textField,
 
 void FloatParameterController::tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY) {
   if (previousSelectedCellY >= 0 && previousSelectedCellX < numberOfRows()-1) {
-    PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *)t->cellAtLocation(previousSelectedCellX, previousSelectedCellY);
+    MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *)t->cellAtLocation(previousSelectedCellX, previousSelectedCellY);
     myCell->setEditing(false);
   }
   if (t->selectedRow() == numberOfRows()-1) {
@@ -121,7 +121,7 @@ void FloatParameterController::tableViewDidChangeSelection(SelectableTableView *
     return;
   }
   if (t->selectedRow() >= 0) {
-    PointerTableCellWithEditableText * myNewCell = (PointerTableCellWithEditableText *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
+    MessageTableCellWithEditableText * myNewCell = (MessageTableCellWithEditableText *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
     app()->setFirstResponder(myNewCell);
   }
 }

apps/shared/function_curve_parameter_controller.cpp

@@ -5,7 +5,7 @@ namespace Shared {
 
 FunctionCurveParameterController::FunctionCurveParameterController(InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor, I18n::Message symbol) :
   ViewController(nullptr),
-  m_goToCell(PointerTableCellWithChevron(I18n::Message::Goto)),
+  m_goToCell(MessageTableCellWithChevron(I18n::Message::Goto)),
   m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin,
     Metric::CommonBottomMargin, Metric::CommonLeftMargin)),
   m_goToParameterController(GoToParameterController(this, graphRange, cursor, symbol)),

apps/shared/function_curve_parameter_controller.h

@@ -18,7 +18,7 @@ public:
   void setFunction(Function * function);
 protected:
   bool handleGotoSelection();
-  PointerTableCellWithChevron m_goToCell;
+  MessageTableCellWithChevron m_goToCell;
   SelectableTableView m_selectableTableView;
 private:
   GoToParameterController m_goToParameterController;

apps/shared/go_to_parameter_controller.cpp

@@ -6,7 +6,7 @@ namespace Shared {
 
 GoToParameterController::GoToParameterController(Responder * parentResponder, InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor, I18n::Message symbol) :
   FloatParameterController(parentResponder),
-  m_abscisseCell(PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, symbol)),
+  m_abscisseCell(MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, symbol)),
   m_graphRange(graphRange),
   m_cursor(cursor),
   m_function(nullptr)

apps/shared/go_to_parameter_controller.h

@@ -23,8 +23,8 @@ private:
   float previousParameterAtIndex(int index) override;
   float parameterAtIndex(int index) override;
   void setParameterAtIndex(int parameterIndex, float f) override;
-  char m_draftTextBuffer[PointerTableCellWithEditableText::k_bufferLength];
-  PointerTableCellWithEditableText m_abscisseCell;
+  char m_draftTextBuffer[MessageTableCellWithEditableText::k_bufferLength];
+  MessageTableCellWithEditableText m_abscisseCell;
   float m_previousParameter;
   InteractiveCurveViewRange * m_graphRange;
   CurveViewCursor * m_cursor;

apps/shared/initialisation_parameter_controller.cpp

@@ -57,7 +57,7 @@ KDCoordinate InitialisationParameterController::cellHeight() {
 }
 
 void InitialisationParameterController::willDisplayCellForIndex(HighlightCell * cell, int index) {
-  PointerTableCell * myCell = (PointerTableCell *)cell;
+  MessageTableCell * myCell = (MessageTableCell *)cell;
   I18n::Message titles[4] = {I18n::Message::Trigonometric, I18n::Message::RoundAbscissa, I18n::Message::Orthonormal, I18n::Message::DefaultSetting};
   myCell->setMessage(titles[index]);
 }

apps/shared/initialisation_parameter_controller.h

@@ -21,7 +21,7 @@ public:
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
 private:
   constexpr static int k_totalNumberOfCells = 4;
-  PointerTableCell m_cells[k_totalNumberOfCells];
+  MessageTableCell m_cells[k_totalNumberOfCells];
   SelectableTableView m_selectableTableView;
   InteractiveCurveViewRange * m_graphRange;
 };

apps/shared/interval_parameter_controller.cpp

@@ -6,7 +6,7 @@ namespace Shared {
 IntervalParameterController::IntervalParameterController(Responder * parentResponder, Interval * interval) :
   FloatParameterController(parentResponder),
   m_interval(interval),
-  m_intervalCells{PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default)}
+  m_intervalCells{MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default)}
 {
 }
 
@@ -29,7 +29,7 @@ void IntervalParameterController::willDisplayCellForIndex(HighlightCell * cell,
   if (index == numberOfRows()-1) {
     return;
   }
-  PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *)cell;
+  MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *)cell;
   I18n::Message labels[k_totalNumberOfCell] = {I18n::Message::XStart, I18n::Message::XEnd, I18n::Message::XStep};
   myCell->setMessage(labels[index]);
   FloatParameterController::willDisplayCellForIndex(cell, index);

apps/shared/interval_parameter_controller.h

@@ -23,8 +23,8 @@ private:
   void setParameterAtIndex(int parameterIndex, float f) override;
   constexpr static int k_totalNumberOfCell = 3;
   Interval * m_interval;
-  char m_draftTextBuffer[PointerTableCellWithEditableText::k_bufferLength];
-  PointerTableCellWithEditableText m_intervalCells[k_totalNumberOfCell];
+  char m_draftTextBuffer[MessageTableCellWithEditableText::k_bufferLength];
+  MessageTableCellWithEditableText m_intervalCells[k_totalNumberOfCell];
   float m_previousParameters[k_totalNumberOfCell];
 };
 

apps/shared/list_parameter_controller.cpp

@@ -8,9 +8,9 @@ ListParameterController::ListParameterController(Responder * parentResponder, Fu
   m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin,
     Metric::CommonBottomMargin, Metric::CommonLeftMargin)),
   m_functionStore(functionStore),
-  m_colorCell(PointerTableCellWithChevron(functionColorMessage)),
-  m_enableCell(PointerTableCellWithSwitch(I18n::Message::ActivateDesactivate)),
-  m_deleteCell(PointerTableCell(deleteFunctionMessage))
+  m_colorCell(MessageTableCellWithChevron(functionColorMessage)),
+  m_enableCell(MessageTableCellWithSwitch(I18n::Message::ActivateDesactivate)),
+  m_deleteCell(MessageTableCell(deleteFunctionMessage))
 {
 }
 

apps/shared/list_parameter_controller.h

@@ -29,9 +29,9 @@ protected:
   Function * m_function;
 private:
   constexpr static int k_totalNumberOfCell = 3;
-  PointerTableCellWithChevron m_colorCell;
-  PointerTableCellWithSwitch m_enableCell;
-  PointerTableCell m_deleteCell;
+  MessageTableCellWithChevron m_colorCell;
+  MessageTableCellWithSwitch m_enableCell;
+  MessageTableCell m_deleteCell;
 };
 
 }

apps/shared/new_function_cell.cpp

@@ -5,13 +5,13 @@ namespace Shared {
 
 NewFunctionCell::NewFunctionCell(I18n::Message text) :
   EvenOddCell(),
-  m_pointerTextView(PointerTextView(KDText::FontSize::Large, text, 0.5f, 0.5f))
+  m_messageTextView(MessageTextView(KDText::FontSize::Large, text, 0.5f, 0.5f))
 {
 }
 
 void NewFunctionCell::reloadCell() {
   EvenOddCell::reloadCell();
-  m_pointerTextView.setBackgroundColor(backgroundColor());
+  m_messageTextView.setBackgroundColor(backgroundColor());
 }
 
 int NewFunctionCell::numberOfSubviews() const {
@@ -20,11 +20,11 @@ int NewFunctionCell::numberOfSubviews() const {
 
 View * NewFunctionCell::subviewAtIndex(int index) {
   assert(index == 0);
-  return &m_pointerTextView;
+  return &m_messageTextView;
 }
 
 void NewFunctionCell::layoutSubviews() {
-  m_pointerTextView.setFrame(bounds());
+  m_messageTextView.setFrame(bounds());
 }
 
 }

apps/shared/new_function_cell.h

@@ -13,7 +13,7 @@ public:
   View * subviewAtIndex(int index) override;
   void layoutSubviews() override;
 private:
-  PointerTextView m_pointerTextView;
+  MessageTextView m_messageTextView;
 };
 
 }

apps/shared/range_parameter_controller.cpp

@@ -10,9 +10,9 @@ namespace Shared {
 RangeParameterController::RangeParameterController(Responder * parentResponder, InteractiveCurveViewRange * interactiveRange) :
   FloatParameterController(parentResponder),
   m_interactiveRange(interactiveRange),
-  m_rangeCells{PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default),
-    PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default)},
-  m_yAutoCell(PointerTableCellWithSwitch(I18n::Message::YAuto))
+  m_rangeCells{MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default),
+    MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default)},
+  m_yAutoCell(MessageTableCellWithSwitch(I18n::Message::YAuto))
 {
 }
 
@@ -52,7 +52,7 @@ void RangeParameterController::willDisplayCellForIndex(HighlightCell * cell, int
     switchView->setState(m_interactiveRange->yAuto());
     return;
   }
-  PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *)cell;
+  MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *)cell;
   I18n::Message labels[k_numberOfTextCell+1] = {I18n::Message::XMin, I18n::Message::XMax, I18n::Message::Default, I18n::Message::YMin, I18n::Message::YMax};
   myCell->setMessage(labels[index]);
   KDColor yColor = m_interactiveRange->yAuto() ? Palette::GreyDark : KDColorBlack;
@@ -69,7 +69,7 @@ bool RangeParameterController::textFieldDidFinishEditing(TextField * textField,
 
 void RangeParameterController::tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY) {
   if (previousSelectedCellX < numberOfRows()-1 && previousSelectedCellY >= 0 && previousSelectedCellY !=2) {
-    PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *)t->cellAtLocation(previousSelectedCellX, previousSelectedCellY);
+    MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *)t->cellAtLocation(previousSelectedCellX, previousSelectedCellY);
     myCell->setEditing(false);
     app()->setFirstResponder(t);
   }
@@ -79,7 +79,7 @@ void RangeParameterController::tableViewDidChangeSelection(SelectableTableView *
     return;
   }
   if (t->selectedRow() >= 0 && t->selectedRow() !=2) {
-    PointerTableCellWithEditableText * myNewCell = (PointerTableCellWithEditableText *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
+    MessageTableCellWithEditableText * myNewCell = (MessageTableCellWithEditableText *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
     if ((t->selectedRow() == 0 || t->selectedRow() == 1) || !m_interactiveRange->yAuto()) {
       app()->setFirstResponder(myNewCell);
     }

apps/shared/range_parameter_controller.h

@@ -26,9 +26,9 @@ private:
   void setParameterAtIndex(int parameterIndex, float f) override;
   constexpr static int k_numberOfTextCell = 4;
   InteractiveCurveViewRange * m_interactiveRange;
-  char m_draftTextBuffer[PointerTableCellWithEditableText::k_bufferLength];
-  PointerTableCellWithEditableText m_rangeCells[k_numberOfTextCell];
-  PointerTableCellWithSwitch m_yAutoCell;
+  char m_draftTextBuffer[MessageTableCellWithEditableText::k_bufferLength];
+  MessageTableCellWithEditableText m_rangeCells[k_numberOfTextCell];
+  MessageTableCellWithSwitch m_yAutoCell;
   float m_previousParameters[k_numberOfTextCell];
   bool m_previousSwitchState;
 };

apps/shared/store_parameter_controller.cpp

@@ -5,9 +5,9 @@ namespace Shared {
 
 StoreParameterController::StoreParameterController(Responder * parentResponder, FloatPairStore * store) :
   ViewController(parentResponder),
-  m_deleteColumn(PointerTableCell(I18n::Message::ClearColumn)),
-  m_copyColumn(PointerTableCellWithChevron(I18n::Message::CopyColumnInList)),
-  m_importList(PointerTableCellWithChevron(I18n::Message::ImportList)),
+  m_deleteColumn(MessageTableCell(I18n::Message::ClearColumn)),
+  m_copyColumn(MessageTableCellWithChevron(I18n::Message::CopyColumnInList)),
+  m_importList(MessageTableCellWithChevron(I18n::Message::ImportList)),
   m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin,
     Metric::CommonBottomMargin, Metric::CommonLeftMargin)),
   m_store(store),

apps/shared/store_parameter_controller.h

@@ -21,9 +21,9 @@ public:
   int reusableCellCount() override;
 private:
   constexpr static int k_totalNumberOfCell = 3;
-  PointerTableCell m_deleteColumn;
-  PointerTableCellWithChevron m_copyColumn;
-  PointerTableCellWithChevron m_importList;
+  MessageTableCell m_deleteColumn;
+  MessageTableCellWithChevron m_copyColumn;
+  MessageTableCellWithChevron m_importList;
   SelectableTableView m_selectableTableView;
   FloatPairStore * m_store;
   bool m_xColumnSelected;

apps/shared/values_controller.cpp

@@ -11,7 +11,7 @@ namespace Shared {
 ValuesController::ValuesController(Responder * parentResponder, ButtonRowController * header, I18n::Message parameterTitle) :
   EditableCellTableViewController(parentResponder, k_topMargin, k_rightMargin, k_bottomMargin, k_leftMargin),
   ButtonRowDelegate(header, nullptr),
-  m_abscissaTitleCell(EvenOddPointerTextCell(KDText::FontSize::Small)),
+  m_abscissaTitleCell(EvenOddMessageTextCell(KDText::FontSize::Small)),
   m_abscissaCells{EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small),
     EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small),
     EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small)},

apps/shared/values_controller.h

@@ -54,7 +54,7 @@ private:
   constexpr static int k_maxNumberOfAbscissaCells = 10;
   virtual int maxNumberOfCells() = 0;
   virtual int maxNumberOfFunctions() = 0;
-  EvenOddPointerTextCell m_abscissaTitleCell;
+  EvenOddMessageTextCell m_abscissaTitleCell;
   virtual FunctionTitleCell * functionTitleCells(int j) = 0;
   virtual EvenOddBufferTextCell * floatCells(int j) = 0;
   char m_draftTextBuffer[EditableTextCell::k_bufferLength];

apps/shared/values_function_parameter_controller.cpp

@@ -5,7 +5,7 @@ namespace Shared {
 
 ValuesFunctionParameterController::ValuesFunctionParameterController(char symbol) :
   ViewController(nullptr),
-  m_copyColumn(PointerTableCellWithChevron(I18n::Message::CopyColumnInList)),
+  m_copyColumn(MessageTableCellWithChevron(I18n::Message::CopyColumnInList)),
   m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin,
     Metric::CommonBottomMargin, Metric::CommonLeftMargin)),
   m_function(nullptr),

apps/shared/values_function_parameter_controller.h

@@ -20,7 +20,7 @@ public:
   virtual int reusableCellCount() override;
   virtual void setFunction(Function * function);
 protected:
-  PointerTableCellWithChevron m_copyColumn;
+  MessageTableCellWithChevron m_copyColumn;
   SelectableTableView m_selectableTableView;
 private:
   constexpr static int k_maxNumberOfCharsInTitle = 16;

apps/shared/values_parameter_controller.cpp

@@ -6,9 +6,9 @@ namespace Shared {
 ValuesParameterController::ValuesParameterController(Responder * parentResponder, IntervalParameterController * intervalParameterController, I18n::Message title) :
   ViewController(parentResponder),
   m_pageTitle(title),
-  m_deleteColumn(PointerTableCell(I18n::Message::ClearColumn)),
-  m_copyColumn(PointerTableCellWithChevron(I18n::Message::CopyColumnInList)),
-  m_setInterval(PointerTableCellWithChevron(I18n::Message::IntervalSet)),
+  m_deleteColumn(MessageTableCell(I18n::Message::ClearColumn)),
+  m_copyColumn(MessageTableCellWithChevron(I18n::Message::CopyColumnInList)),
+  m_setInterval(MessageTableCellWithChevron(I18n::Message::IntervalSet)),
   m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin,
     Metric::CommonBottomMargin, Metric::CommonLeftMargin)),
   m_intervalParameterController(intervalParameterController)

apps/shared/values_parameter_controller.h

@@ -20,9 +20,9 @@ public:
 private:
   constexpr static int k_totalNumberOfCell = 3;
   I18n::Message m_pageTitle;
-  PointerTableCell m_deleteColumn;
-  PointerTableCellWithChevron m_copyColumn;
-  PointerTableCellWithChevron m_setInterval;
+  MessageTableCell m_deleteColumn;
+  MessageTableCellWithChevron m_copyColumn;
+  MessageTableCellWithChevron m_setInterval;
   SelectableTableView m_selectableTableView;
   IntervalParameterController * m_intervalParameterController;
 };

apps/shared/zoom_parameter_controller.cpp

@@ -93,11 +93,11 @@ CurveView * ZoomParameterController::ContentView::curveView() {
 /* Legend View */
 
 ZoomParameterController::ContentView::LegendView::LegendView() :
-  m_legends{PointerTextView(KDText::FontSize::Small, I18n::Message::TopCapital, 0.0f, 0.5f, KDColorBlack, Palette::GreyBright),
-    PointerTextView(KDText::FontSize::Small, I18n::Message::LeftCapital, 0.0f, 0.5f, KDColorBlack, Palette::GreyBright),
-    PointerTextView(KDText::FontSize::Small, I18n::Message::ZoomCapital, 0.5f, 0.5f, KDColorBlack, Palette::GreyBright),
-    PointerTextView(KDText::FontSize::Small, I18n::Message::BottomCapital, 1.0f, 0.5f, KDColorBlack, Palette::GreyBright),
-    PointerTextView(KDText::FontSize::Small, I18n::Message::RightCapital, 1.0f, 0.5f, KDColorBlack, Palette::GreyBright)},
+  m_legends{MessageTextView(KDText::FontSize::Small, I18n::Message::TopCapital, 0.0f, 0.5f, KDColorBlack, Palette::GreyBright),
+    MessageTextView(KDText::FontSize::Small, I18n::Message::LeftCapital, 0.0f, 0.5f, KDColorBlack, Palette::GreyBright),
+    MessageTextView(KDText::FontSize::Small, I18n::Message::ZoomCapital, 0.5f, 0.5f, KDColorBlack, Palette::GreyBright),
+    MessageTextView(KDText::FontSize::Small, I18n::Message::BottomCapital, 1.0f, 0.5f, KDColorBlack, Palette::GreyBright),
+    MessageTextView(KDText::FontSize::Small, I18n::Message::RightCapital, 1.0f, 0.5f, KDColorBlack, Palette::GreyBright)},
   m_legendPictograms{KeyView(KeyView::Type::Up), KeyView(KeyView::Type::Left),
     KeyView(KeyView::Type::Plus), KeyView(KeyView::Type::Minus),
     KeyView(KeyView::Type::Down), KeyView(KeyView::Type::Right)}

apps/shared/zoom_parameter_controller.h

@@ -33,7 +33,7 @@ private:
       void layoutSubviews() override;
       int numberOfSubviews() const override;
       View * subviewAtIndex(int index) override;
-      PointerTextView m_legends[k_numberOfLegends-1];
+      MessageTextView m_legends[k_numberOfLegends-1];
       KeyView m_legendPictograms[k_numberOfLegends];
     };
     int numberOfSubviews() const override;

apps/statistics/box_banner_view.cpp

@@ -17,9 +17,9 @@ TextView * BoxBannerView::textViewAtIndex(int index) const {
   return (TextView *)textViews[index];
 }
 
-PointerTextView * BoxBannerView::pointerTextViewAtIndex(int index) const {
+MessageTextView * BoxBannerView::messageTextViewAtIndex(int index) const {
   if (index == 0) {
-    return (PointerTextView *)&m_calculationName;
+    return (MessageTextView *)&m_calculationName;
   }
   return nullptr;
 }

apps/statistics/box_banner_view.h

@@ -13,8 +13,8 @@ public:
 private:
   int numberOfSubviews() const override;
   TextView * textViewAtIndex(int i) const override;
-  PointerTextView * pointerTextViewAtIndex(int i) const override;
-  PointerTextView m_calculationName;
+  MessageTextView * messageTextViewAtIndex(int i) const override;
+  MessageTextView m_calculationName;
   BufferTextView m_calculationValue;
 };
 

apps/statistics/calculation_controller.cpp

@@ -13,8 +13,8 @@ namespace Statistics {
 CalculationController::CalculationController(Responder * parentResponder, ButtonRowController * header, Store * store) :
   TabTableController(parentResponder, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin, nullptr, true),
   ButtonRowDelegate(header, nullptr),
-  m_titleCells{EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small),
-    EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small)},
+  m_titleCells{EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small),
+    EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small)},
   m_calculationCells{EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small),
     EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small)},
   m_store(store)
@@ -76,7 +76,7 @@ void CalculationController::willDisplayCellAtLocation(HighlightCell * cell, int
   myCell->setHighlighted(i == m_selectableTableView.selectedColumn() && j == m_selectableTableView.selectedRow());
   if (i == 0) {
     I18n::Message titles[k_totalNumberOfRows] = {I18n::Message::TotalSize, I18n::Message::Minimum, I18n::Message::Maximum, I18n::Message::Range, I18n::Message::Mean, I18n::Message::StandardDeviation, I18n::Message::Deviation, I18n::Message::FirstQuartile, I18n::Message::ThirdQuartile, I18n::Message::Median, I18n::Message::InterquartileRange, I18n::Message::Sum, I18n::Message::SquareSum};
-    EvenOddPointerTextCell * myCell = (EvenOddPointerTextCell *)cell;
+    EvenOddMessageTextCell * myCell = (EvenOddMessageTextCell *)cell;
     myCell->setMessage(titles[j]);
   } else {
     CalculPointer calculationMethods[k_totalNumberOfRows] = {&Store::sumOfOccurrences, &Store::minValue,

apps/statistics/calculation_controller.h

@@ -34,7 +34,7 @@ private:
   constexpr static int k_maxNumberOfDisplayableRows = 11;
   static constexpr KDCoordinate k_cellHeight = 20;
   static constexpr KDCoordinate k_cellWidth = Ion::Display::Width/2 - Metric::CommonRightMargin/2 - Metric::CommonLeftMargin/2;
-  EvenOddPointerTextCell m_titleCells[k_maxNumberOfDisplayableRows];
+  EvenOddMessageTextCell m_titleCells[k_maxNumberOfDisplayableRows];
   EvenOddBufferTextCell m_calculationCells[k_maxNumberOfDisplayableRows];
   Store * m_store;
 };

apps/statistics/histogram_banner_view.cpp

@@ -24,9 +24,9 @@ TextView * HistogramBannerView::textViewAtIndex(int i) const {
   return (TextView *)textViews[i];
 }
 
-PointerTextView * HistogramBannerView::pointerTextViewAtIndex(int index) const {
-  const PointerTextView * textViews[6] = {&m_intervalLegendView, nullptr, &m_sizeLegendView, nullptr, &m_frequencyLegendView, nullptr};
-  return (PointerTextView *)textViews[index];
+MessageTextView * HistogramBannerView::messageTextViewAtIndex(int index) const {
+  const MessageTextView * textViews[6] = {&m_intervalLegendView, nullptr, &m_sizeLegendView, nullptr, &m_frequencyLegendView, nullptr};
+  return (MessageTextView *)textViews[index];
 }
 
 }

apps/statistics/histogram_banner_view.h

@@ -13,12 +13,12 @@ public:
 private:
   int numberOfSubviews() const override;
   TextView * textViewAtIndex(int i) const override;
-  PointerTextView * pointerTextViewAtIndex(int index) const override;
-  PointerTextView m_intervalLegendView;
+  MessageTextView * messageTextViewAtIndex(int index) const override;
+  MessageTextView m_intervalLegendView;
   BufferTextView m_intervalView;
-  PointerTextView m_sizeLegendView;
+  MessageTextView m_sizeLegendView;
   BufferTextView m_sizeView;
-  PointerTextView m_frequencyLegendView;
+  MessageTextView m_frequencyLegendView;
   BufferTextView m_frequencyView;
 };
 

apps/statistics/histogram_parameter_controller.cpp

@@ -8,7 +8,7 @@ namespace Statistics {
 
 HistogramParameterController::HistogramParameterController(Responder * parentResponder, Store * store) :
   FloatParameterController(parentResponder),
-  m_cells{PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default)},
+  m_cells{MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default)},
   m_store(store)
 {
 }
@@ -32,7 +32,7 @@ void HistogramParameterController::willDisplayCellForIndex(HighlightCell * cell,
   if (index == numberOfRows()-1) {
     return;
   }
-  PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *)cell;
+  MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *)cell;
   I18n::Message labels[2] = {I18n::Message::RectangleWidth, I18n::Message::BarStart};
   myCell->setMessage(labels[index]);
   FloatParameterController::willDisplayCellForIndex(cell, index);

apps/statistics/histogram_parameter_controller.h

@@ -20,8 +20,8 @@ private:
   float parameterAtIndex(int index) override;
   float previousParameterAtIndex(int index) override;
   void setParameterAtIndex(int parameterIndex, float f) override;
-  char m_draftTextBuffer[PointerTableCellWithEditableText::k_bufferLength];
-  PointerTableCellWithEditableText m_cells[2];
+  char m_draftTextBuffer[MessageTableCellWithEditableText::k_bufferLength];
+  MessageTableCellWithEditableText m_cells[2];
   float m_previousParameters[2];
   Store * m_store;
 };

apps/statistics/store_controller.cpp

@@ -10,7 +10,7 @@ namespace Statistics {
 
 StoreController::StoreController(Responder * parentResponder, Store * store, ButtonRowController * header) :
   Shared::StoreController(parentResponder, store, header),
-  m_titleCells{EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small)}
+  m_titleCells{EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small)}
 {
 }
 
@@ -19,7 +19,7 @@ void StoreController::willDisplayCellAtLocation(HighlightCell * cell, int i, int
   if (cellAtLocationIsEditable(i, j)) {
     return;
   }
-  EvenOddPointerTextCell * mytitleCell = (EvenOddPointerTextCell *)cell;
+  EvenOddMessageTextCell * mytitleCell = (EvenOddMessageTextCell *)cell;
   if (i == 0) {
     mytitleCell->setMessage(I18n::Message::Values);
     return;

apps/statistics/store_controller.h

@@ -13,7 +13,7 @@ public:
   void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
 private:
   HighlightCell * titleCells(int index) override;
-  EvenOddPointerTextCell m_titleCells[k_numberOfTitleCells];
+  EvenOddMessageTextCell m_titleCells[k_numberOfTitleCells];
 };
 
 }

apps/title_bar_view.h

@@ -17,7 +17,7 @@ private:
   int numberOfSubviews() const override;
   void layoutSubviews() override;
   View * subviewAtIndex(int index) override;
-  PointerTextView m_titleView;
+  MessageTextView m_titleView;
   BatteryView m_batteryView;
   BufferTextView m_preferenceView;
 };

apps/variable_box_controller.cpp

@@ -107,7 +107,7 @@ int VariableBoxController::ContentViewController::reusableCellCount(int type) {
 void VariableBoxController::ContentViewController::willDisplayCellForIndex(HighlightCell * cell, int index) {
   if (m_currentPage == Page::RootMenu) {
     I18n::Message label = nodeLabelAtIndex(index);
-    PointerTableCell * myCell = (PointerTableCell *)cell;
+    MessageTableCell * myCell = (MessageTableCell *)cell;
     myCell->setMessage(label);
     return;
   }

apps/variable_box_controller.h

@@ -55,7 +55,7 @@ private:
     int m_previousSelectedRow;
     Page m_currentPage;
     VariableBoxLeafCell m_leafCells[k_maxNumberOfDisplayedRows];
-    PointerTableCellWithChevron m_nodeCells[k_numberOfMenuRows];
+    MessageTableCellWithChevron m_nodeCells[k_numberOfMenuRows];
     SelectableTableView m_selectableTableView;
   };
   ContentViewController m_contentViewController;

escher/Makefile

@@ -13,7 +13,7 @@ objs += $(addprefix escher/src/,\
   even_odd_buffer_text_cell.o\
   even_odd_editable_text_cell.o\
   even_odd_expression_cell.o\
-  even_odd_pointer_text_cell.o\
+  even_odd_message_text_cell.o\
   expression_table_cell.o\
   expression_table_cell_with_pointer.o\
   expression_view.o\
@@ -24,17 +24,17 @@ objs += $(addprefix escher/src/,\
   input_view_controller.o\
   key_view.o\
   list_view_data_source.o\
+  message_table_cell.o\
+  message_table_cell_with_buffer.o\
+  message_table_cell_with_chevron.o\
+  message_table_cell_with_chevron_and_message.o\
+  message_table_cell_with_chevron_and_expression.o\
+  message_table_cell_with_editable_text.o\
+  message_table_cell_with_message.o\
+  message_table_cell_with_switch.o\
+  message_text_view.o\
   modal_view_controller.o\
   palette.o\
-  pointer_table_cell.o\
-  pointer_table_cell_with_buffer.o\
-  pointer_table_cell_with_chevron.o\
-  pointer_table_cell_with_chevron_and_pointer.o\
-  pointer_table_cell_with_chevron_and_expression.o\
-  pointer_table_cell_with_editable_text.o\
-  pointer_table_cell_with_pointer.o\
-  pointer_table_cell_with_switch.o\
-  pointer_text_view.o\
   responder.o\
   run_loop.o\
   scroll_view.o\

escher/include/escher.h

@@ -14,7 +14,7 @@
 #include <escher/even_odd_buffer_text_cell.h>
 #include <escher/even_odd_editable_text_cell.h>
 #include <escher/even_odd_expression_cell.h>
-#include <escher/even_odd_pointer_text_cell.h>
+#include <escher/even_odd_message_text_cell.h>
 #include <escher/expression_table_cell.h>
 #include <escher/expression_table_cell_with_pointer.h>
 #include <escher/expression_view.h>
@@ -27,18 +27,18 @@
 #include <escher/i18n.h>
 #include <escher/key_view.h>
 #include <escher/list_view_data_source.h>
+#include <escher/message_table_cell.h>
+#include <escher/message_table_cell_with_buffer.h>
+#include <escher/message_table_cell_with_chevron.h>
+#include <escher/message_table_cell_with_chevron_and_message.h>
+#include <escher/message_table_cell_with_chevron_and_expression.h>
+#include <escher/message_table_cell_with_editable_text.h>
+#include <escher/message_table_cell_with_message.h>
+#include <escher/message_table_cell_with_switch.h>
+#include <escher/message_text_view.h>
 #include <escher/metric.h>
 #include <escher/modal_view_controller.h>
 #include <escher/palette.h>
-#include <escher/pointer_table_cell.h>
-#include <escher/pointer_table_cell_with_buffer.h>
-#include <escher/pointer_table_cell_with_chevron.h>
-#include <escher/pointer_table_cell_with_chevron_and_pointer.h>
-#include <escher/pointer_table_cell_with_chevron_and_expression.h>
-#include <escher/pointer_table_cell_with_editable_text.h>
-#include <escher/pointer_table_cell_with_pointer.h>
-#include <escher/pointer_table_cell_with_switch.h>
-#include <escher/pointer_text_view.h>
 #include <escher/responder.h>
 #include <escher/scroll_view.h>
 #include <escher/scroll_view_indicator.h>

escher/include/escher/alternate_empty_view_controller.h

@@ -3,7 +3,7 @@
 
 #include <escher/alternate_empty_view_delegate.h>
 #include <escher/i18n.h>
-#include <escher/pointer_text_view.h>
+#include <escher/message_text_view.h>
 #include <escher/view_controller.h>
 
 class AlternateEmptyViewController : public ViewController {
@@ -25,7 +25,7 @@ private:
   private:
     int numberOfSubviews() const override;
     View * subviewAtIndex(int index) override;
-    PointerTextView m_message;
+    MessageTextView m_message;
     ViewController * m_mainViewController;
     AlternateEmptyViewDelegate * m_delegate;
   };

escher/include/escher/button.h

@@ -4,7 +4,7 @@
 #include <escher/highlight_cell.h>
 #include <escher/i18n.h>
 #include <escher/responder.h>
-#include <escher/pointer_text_view.h>
+#include <escher/message_text_view.h>
 #include <escher/invocation.h>
 
 class Button : public HighlightCell, public Responder {
@@ -14,7 +14,7 @@ public:
   void setHighlighted(bool highlight) override;
   KDSize minimalSizeForOptimalDisplay() const override;
 protected:
-  PointerTextView m_pointerTextView;
+  MessageTextView m_messageTextView;
 private:
   constexpr static KDCoordinate k_verticalMargin = 5;
   constexpr static KDCoordinate k_horizontalMargin = 10;

escher/include/escher/even_odd_message_text_cell.h

@@ -1,13 +1,13 @@
-#ifndef ESCHER_EVEN_ODD_POINTER_TEXT_CELL_H
-#define ESCHER_EVEN_ODD_POINTER_TEXT_CELL_H
+#ifndef ESCHER_EVEN_ODD_MESSAGE_TEXT_CELL_H
+#define ESCHER_EVEN_ODD_MESSAGE_TEXT_CELL_H
 
 #include <escher/even_odd_cell.h>
 #include <escher/i18n.h>
-#include <escher/pointer_text_view.h>
+#include <escher/message_text_view.h>
 
-class EvenOddPointerTextCell : public EvenOddCell {
+class EvenOddMessageTextCell : public EvenOddCell {
 public:
-  EvenOddPointerTextCell(KDText::FontSize size = KDText::FontSize::Large);
+  EvenOddMessageTextCell(KDText::FontSize size = KDText::FontSize::Large);
   void setEven(bool even) override;
   void setHighlighted(bool highlight) override;
   void setMessage(I18n::Message textContent, KDColor textColor = KDColorBlack);
@@ -16,7 +16,7 @@ public:
   View * subviewAtIndex(int index) override;
   void layoutSubviews() override;
 protected:
-  PointerTextView m_pointerTextView;
+  MessageTextView m_messageTextView;
 };
 
 #endif

escher/include/escher/expression_table_cell_with_pointer.h

@@ -3,7 +3,7 @@
 
 #include <escher/expression_table_cell.h>
 #include <escher/i18n.h>
-#include <escher/pointer_text_view.h>
+#include <escher/message_text_view.h>
 
 class ExpressionTableCellWithPointer : public ExpressionTableCell {
 public:
@@ -12,7 +12,7 @@ public:
   void setHighlighted(bool highlight) override;
   void setAccessoryMessage(I18n::Message messageBody);
 private:
-  PointerTextView m_accessoryView;
+  MessageTextView m_accessoryView;
 };
 
 #endif

escher/include/escher/message_table_cell.h

@@ -1,19 +1,19 @@
-#ifndef ESCHER_POINTER_TABLE_CELL_H
-#define ESCHER_POINTER_TABLE_CELL_H
+#ifndef ESCHER_MESSAGE_TABLE_CELL_H
+#define ESCHER_MESSAGE_TABLE_CELL_H
 
-#include <escher/pointer_text_view.h>
+#include <escher/message_text_view.h>
 #include <escher/i18n.h>
 #include <escher/table_cell.h>
 
-class PointerTableCell : public TableCell {
+class MessageTableCell : public TableCell {
 public:
-  PointerTableCell(I18n::Message label = (I18n::Message)0, KDText::FontSize size = KDText::FontSize::Small, Layout layout = Layout::Horizontal);
+  MessageTableCell(I18n::Message label = (I18n::Message)0, KDText::FontSize size = KDText::FontSize::Small, Layout layout = Layout::Horizontal);
   View * labelView() const override;
   virtual void setHighlighted(bool highlight) override;
   void setMessage(I18n::Message message);
   virtual void setTextColor(KDColor color);
 private:
-  PointerTextView m_pointerTextView;
+  MessageTextView m_messageTextView;
 };
 
 #endif

escher/include/escher/message_table_cell_with_buffer.h

@@ -1,12 +1,12 @@
-#ifndef ESCHER_POINTER_TABLE_CELL_WITH_BUFFER_H
-#define ESCHER_POINTER_TABLE_CELL_WITH_BUFFER_H
+#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_BUFFER_H
+#define ESCHER_MESSAGE_TABLE_CELL_WITH_BUFFER_H
 
-#include <escher/pointer_table_cell.h>
+#include <escher/message_table_cell.h>
 #include <escher/buffer_text_view.h>
 
-class PointerTableCellWithBuffer : public PointerTableCell {
+class MessageTableCellWithBuffer : public MessageTableCell {
 public:
-  PointerTableCellWithBuffer(I18n::Message message = (I18n::Message)0);
+  MessageTableCellWithBuffer(I18n::Message message = (I18n::Message)0);
   View * accessoryView() const override;
   void setHighlighted(bool highlight) override;
   void setAccessoryText(const char * textBody);

escher/include/escher/message_table_cell_with_chevron.h

@@ -0,0 +1,15 @@
+#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_CHEVRON_H
+#define ESCHER_MESSAGE_TABLE_CELL_WITH_CHEVRON_H
+
+#include <escher/message_table_cell.h>
+#include <escher/chevron_view.h>
+
+class MessageTableCellWithChevron : public MessageTableCell {
+public:
+  MessageTableCellWithChevron(I18n::Message message = (I18n::Message)0, KDText::FontSize size = KDText::FontSize::Small);
+  View * accessoryView() const override;
+private:
+  ChevronView m_accessoryView;
+};
+
+#endif

escher/include/escher/message_table_cell_with_chevron_and_expression.h

@@ -1,12 +1,12 @@
-#ifndef ESCHER_POINTER_TABLE_CELL_WITH_CHEVRON_AND_EXPRESSION_H
-#define ESCHER_POINTER_TABLE_CELL_WITH_CHEVRON_AND_EXPRESSION_H
+#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_CHEVRON_AND_EXPRESSION_H
+#define ESCHER_MESSAGE_TABLE_CELL_WITH_CHEVRON_AND_EXPRESSION_H
 
-#include <escher/pointer_table_cell_with_chevron.h>
+#include <escher/message_table_cell_with_chevron.h>
 #include <escher/expression_view.h>
 
-class PointerTableCellWithChevronAndExpression : public PointerTableCellWithChevron {
+class MessageTableCellWithChevronAndExpression : public MessageTableCellWithChevron {
 public:
-  PointerTableCellWithChevronAndExpression(I18n::Message message = (I18n::Message)0, KDText::FontSize size = KDText::FontSize::Small);
+  MessageTableCellWithChevronAndExpression(I18n::Message message = (I18n::Message)0, KDText::FontSize size = KDText::FontSize::Small);
   View * subAccessoryView() const override;
   void setHighlighted(bool highlight) override;
   void setExpression(Poincare::ExpressionLayout * expressionLayout);

escher/include/escher/message_table_cell_with_chevron_and_message.h

@@ -0,0 +1,16 @@
+#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_CHEVRON_AND_MESSAGE_H
+#define ESCHER_MESSAGE_TABLE_CELL_WITH_CHEVRON_AND_MESSAGE_H
+
+#include <escher/message_table_cell_with_chevron.h>
+
+class MessageTableCellWithChevronAndMessage : public MessageTableCellWithChevron {
+public:
+  MessageTableCellWithChevronAndMessage(KDText::FontSize labelSize = KDText::FontSize::Small, KDText::FontSize contentSize = KDText::FontSize::Small);
+  View * subAccessoryView() const override;
+  void setHighlighted(bool highlight) override;
+  void setSubtitle(I18n::Message text);
+private:
+  MessageTextView m_subtitleView;
+};
+
+#endif

escher/include/escher/message_table_cell_with_editable_text.h

@@ -1,13 +1,13 @@
-#ifndef ESCHER_POINTER_TABLE_CELL_WITH_EDITABLE_TEXT_H
-#define ESCHER_POINTER_TABLE_CELL_WITH_EDITABLE_TEXT_H
+#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_EDITABLE_TEXT_H
+#define ESCHER_MESSAGE_TABLE_CELL_WITH_EDITABLE_TEXT_H
 
 #include <escher/editable_text_cell.h>
-#include <escher/pointer_table_cell.h>
+#include <escher/message_table_cell.h>
 #include <escher/responder.h>
 
-class PointerTableCellWithEditableText : public Responder, public PointerTableCell {
+class MessageTableCellWithEditableText : public Responder, public MessageTableCell {
 public:
-  PointerTableCellWithEditableText(Responder * parentResponder, TextFieldDelegate * textFieldDelegate, char * draftTextBuffer, I18n::Message message = (I18n::Message)0);
+  MessageTableCellWithEditableText(Responder * parentResponder, TextFieldDelegate * textFieldDelegate, char * draftTextBuffer, I18n::Message message = (I18n::Message)0);
   View * accessoryView() const override;
   const char * editedText() const;
   void didBecomeFirstResponder() override;

escher/include/escher/message_table_cell_with_message.h

@@ -1,18 +1,18 @@
-#ifndef ESCHER_POINTER_TABLE_CELL_WITH_POINTER_H
-#define ESCHER_POINTER_TABLE_CELL_WITH_POINTER_H
+#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_MESSAGE_H
+#define ESCHER_MESSAGE_TABLE_CELL_WITH_MESSAGE_H
 
-#include <escher/pointer_table_cell.h>
+#include <escher/message_table_cell.h>
 
-class PointerTableCellWithPointer : public PointerTableCell {
+class MessageTableCellWithMessage : public MessageTableCell {
 public:
-  PointerTableCellWithPointer(I18n::Message message = (I18n::Message)0, Layout layout = Layout::Vertical);
+  MessageTableCellWithMessage(I18n::Message message = (I18n::Message)0, Layout layout = Layout::Vertical);
   View * accessoryView() const override;
   void setHighlighted(bool highlight) override;
   void setAccessoryMessage(I18n::Message textBody);
   void setTextColor(KDColor color) override;
   void setAccessoryTextColor(KDColor color);
 protected:
-  PointerTextView m_accessoryView;
+  MessageTextView m_accessoryView;
 };
 
 #endif

escher/include/escher/message_table_cell_with_switch.h

@@ -0,0 +1,15 @@
+#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_SWITCH_H
+#define ESCHER_MESSAGE_TABLE_CELL_WITH_SWITCH_H
+
+#include <escher/message_table_cell.h>
+#include <escher/switch_view.h>
+
+class MessageTableCellWithSwitch : public MessageTableCell {
+public:
+  MessageTableCellWithSwitch(I18n::Message message = (I18n::Message)0);
+  View * accessoryView() const override;
+private:
+  SwitchView m_accessoryView;
+};
+
+#endif

escher/include/escher/message_text_view.h

@@ -1,12 +1,12 @@
-#ifndef ESCHER_POINTER_TEXT_VIEW_H
-#define ESCHER_POINTER_TEXT_VIEW_H
+#ifndef ESCHER_MESSAGE_TEXT_VIEW_H
+#define ESCHER_MESSAGE_TEXT_VIEW_H
 
 #include <escher/text_view.h>
 #include <escher/i18n.h>
 
-class PointerTextView : public TextView {
+class MessageTextView : public TextView {
 public:
-  PointerTextView(KDText::FontSize size = KDText::FontSize::Large, I18n::Message message = (I18n::Message)0, float horizontalAlignment = 0.0f, float verticalAlignment = 0.0f,
+  MessageTextView(KDText::FontSize size = KDText::FontSize::Large, I18n::Message message = (I18n::Message)0, float horizontalAlignment = 0.0f, float verticalAlignment = 0.0f,
     KDColor textColor = KDColorBlack, KDColor backgroundColor = KDColorWhite);
   void setText(const char * text) override;
   void setMessage(I18n::Message message);

escher/include/escher/pointer_table_cell_with_chevron.h

@@ -1,15 +0,0 @@
-#ifndef ESCHER_POINTER_TABLE_CELL_WITH_CHEVRON_H
-#define ESCHER_POINTER_TABLE_CELL_WITH_CHEVRON_H
-
-#include <escher/pointer_table_cell.h>
-#include <escher/chevron_view.h>
-
-class PointerTableCellWithChevron : public PointerTableCell {
-public:
-  PointerTableCellWithChevron(I18n::Message message = (I18n::Message)0, KDText::FontSize size = KDText::FontSize::Small);
-  View * accessoryView() const override;
-private:
-  ChevronView m_accessoryView;
-};
-
-#endif

escher/include/escher/pointer_table_cell_with_chevron_and_pointer.h

@@ -1,16 +0,0 @@
-#ifndef ESCHER_POINTER_TABLE_CELL_WITH_CHEVRON_AND_POINTER_H
-#define ESCHER_POINTER_TABLE_CELL_WITH_CHEVRON_AND_POINTER_H
-
-#include <escher/pointer_table_cell_with_chevron.h>
-
-class PointerTableCellWithChevronAndPointer : public PointerTableCellWithChevron {
-public:
-  PointerTableCellWithChevronAndPointer(KDText::FontSize labelSize = KDText::FontSize::Small, KDText::FontSize contentSize = KDText::FontSize::Small);
-  View * subAccessoryView() const override;
-  void setHighlighted(bool highlight) override;
-  void setSubtitle(I18n::Message text);
-private:
-  PointerTextView m_subtitleView;
-};
-
-#endif

escher/include/escher/pointer_table_cell_with_switch.h

@@ -1,15 +0,0 @@
-#ifndef ESCHER_POINTER_TABLE_CELL_WITH_SWITCH_H
-#define ESCHER_POINTER_TABLE_CELL_WITH_SWITCH_H
-
-#include <escher/pointer_table_cell.h>
-#include <escher/switch_view.h>
-
-class PointerTableCellWithSwitch : public PointerTableCell {
-public:
-  PointerTableCellWithSwitch(I18n::Message message = (I18n::Message)0);
-  View * accessoryView() const override;
-private:
-  SwitchView m_accessoryView;
-};
-
-#endif

escher/include/escher/warning_controller.h

@@ -2,7 +2,7 @@
 #define ESCHER_WARNING_CONTROLLER_H
 
 #include <escher/view_controller.h>
-#include <escher/pointer_text_view.h>
+#include <escher/message_text_view.h>
 #include <escher/solid_color_view.h>
 #include <escher/i18n.h>
 
@@ -25,7 +25,7 @@ private:
   private:
     constexpr static KDCoordinate k_verticalMargin = 40;
     constexpr static KDCoordinate k_horizontalMargin = 20;
-    PointerTextView m_textView;
+    MessageTextView m_textView;
   };
 
   ContentView m_contentView;