From 4ad3adaab2ac8d75a27e2bb720a46affef2db667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Tue, 5 Dec 2017 17:45:54 +0100 Subject: [PATCH] [apps/escher] Changed setExpression to setExpressionLayout. Change-Id: I095a12868fd7eaf8d4eb2408617941a86f43e1ee --- apps/calculation/history_view_cell.cpp | 2 +- apps/calculation/output_expressions_view.cpp | 4 ++-- apps/calculation/scrollable_expression_view.cpp | 4 ++-- apps/calculation/scrollable_expression_view.h | 2 +- apps/expression_editor/controller.cpp | 2 +- apps/graph/list/list_controller.cpp | 2 +- apps/regression/calculation_controller.cpp | 2 +- apps/regression/store_controller.cpp | 2 +- apps/sequence/graph/term_sum_controller.cpp | 6 +++--- apps/sequence/list/list_controller.cpp | 12 ++++++------ apps/sequence/list/list_parameter_controller.cpp | 2 +- apps/sequence/list/sequence_toolbox.cpp | 2 +- apps/sequence/list/type_parameter_controller.cpp | 2 +- apps/sequence/sequence_title_cell.cpp | 4 ++-- apps/sequence/sequence_title_cell.h | 2 +- apps/sequence/values/values_controller.cpp | 2 +- apps/settings/main_controller.cpp | 2 +- apps/settings/sub_controller.cpp | 2 +- apps/shared/function_expression_cell.cpp | 4 ++-- apps/shared/function_expression_cell.h | 2 +- apps/variable_box_leaf_cell.cpp | 2 +- escher/include/escher/even_odd_expression_cell.h | 2 +- escher/include/escher/expression_table_cell.h | 2 +- escher/include/escher/expression_view.h | 2 +- .../message_table_cell_with_chevron_and_expression.h | 2 +- escher/src/even_odd_expression_cell.cpp | 4 ++-- escher/src/expression_table_cell.cpp | 4 ++-- escher/src/expression_view.cpp | 2 +- ...essage_table_cell_with_chevron_and_expression.cpp | 4 ++-- 29 files changed, 43 insertions(+), 43 deletions(-) diff --git a/apps/calculation/history_view_cell.cpp b/apps/calculation/history_view_cell.cpp index 02c1ec198..5518bcdca 100644 --- a/apps/calculation/history_view_cell.cpp +++ b/apps/calculation/history_view_cell.cpp @@ -83,7 +83,7 @@ void HistoryViewCell::layoutSubviews() { } void HistoryViewCell::setCalculation(Calculation * calculation) { - m_inputView.setExpression(calculation->inputLayout()); + m_inputView.setExpressionLayout(calculation->inputLayout()); App * calculationApp = (App *)app(); /* Both output expressions have to be updated at the same time. The * outputView points to deleted layouts and a call to diff --git a/apps/calculation/output_expressions_view.cpp b/apps/calculation/output_expressions_view.cpp index 43caefc23..7deeddb64 100644 --- a/apps/calculation/output_expressions_view.cpp +++ b/apps/calculation/output_expressions_view.cpp @@ -16,8 +16,8 @@ OutputExpressionsView::OutputExpressionsView(Responder * parentResponder) : } void OutputExpressionsView::setExpressions(ExpressionLayout ** expressionsLayout) { - m_approximateExpressionView.setExpression(expressionsLayout[0]); - m_exactExpressionView.setExpression(expressionsLayout[1]); + m_approximateExpressionView.setExpressionLayout(expressionsLayout[0]); + m_exactExpressionView.setExpressionLayout(expressionsLayout[1]); layoutSubviews(); } diff --git a/apps/calculation/scrollable_expression_view.cpp b/apps/calculation/scrollable_expression_view.cpp index def347a0f..4fd7572df 100644 --- a/apps/calculation/scrollable_expression_view.cpp +++ b/apps/calculation/scrollable_expression_view.cpp @@ -10,8 +10,8 @@ ScrollableExpressionView::ScrollableExpressionView(Responder * parentResponder) { } -void ScrollableExpressionView::setExpression(ExpressionLayout * expressionLayout) { - m_expressionView.setExpression(expressionLayout); +void ScrollableExpressionView::setExpressionLayout(ExpressionLayout * expressionLayout) { + m_expressionView.setExpressionLayout(expressionLayout); layoutSubviews(); } diff --git a/apps/calculation/scrollable_expression_view.h b/apps/calculation/scrollable_expression_view.h index a613600f1..fb156fbc9 100644 --- a/apps/calculation/scrollable_expression_view.h +++ b/apps/calculation/scrollable_expression_view.h @@ -8,7 +8,7 @@ namespace Calculation { class ScrollableExpressionView : public ScrollableView, public ScrollViewDataSource { public: ScrollableExpressionView(Responder * parentResponder); - void setExpression(Poincare::ExpressionLayout * expressionLayout); + void setExpressionLayout(Poincare::ExpressionLayout * expressionLayout); void setBackgroundColor(KDColor backgroundColor); KDSize minimalSizeForOptimalDisplay() const override; private: diff --git a/apps/expression_editor/controller.cpp b/apps/expression_editor/controller.cpp index 8c51c5d4d..a62313cdc 100644 --- a/apps/expression_editor/controller.cpp +++ b/apps/expression_editor/controller.cpp @@ -6,7 +6,7 @@ Controller::ContentView::ContentView(ExpressionAndLayout * expressionAndLayout) SolidColorView(KDColorWhite), m_expressionView() { - m_expressionView.setExpression(expressionAndLayout->expressionLayout()); + m_expressionView.setExpressionLayout(expressionAndLayout->expressionLayout()); } void Controller::ContentView::layoutSubviews() { diff --git a/apps/graph/list/list_controller.cpp b/apps/graph/list/list_controller.cpp index 1eb2f4a0d..9c84175d6 100644 --- a/apps/graph/list/list_controller.cpp +++ b/apps/graph/list/list_controller.cpp @@ -90,7 +90,7 @@ void ListController::willDisplayTitleCellAtIndex(HighlightCell * cell, int j) { void ListController::willDisplayExpressionCellAtIndex(HighlightCell * cell, int j) { FunctionExpressionCell * myCell = (FunctionExpressionCell *)cell; Function * f = m_functionStore->functionAtIndex(j); - myCell->setExpression(f->layout()); + myCell->setExpressionLayout(f->layout()); bool active = f->isActive(); KDColor textColor = active ? KDColorBlack : Palette::GreyDark; myCell->setTextColor(textColor); diff --git a/apps/regression/calculation_controller.cpp b/apps/regression/calculation_controller.cpp index 4b231acc6..1a937c6ea 100644 --- a/apps/regression/calculation_controller.cpp +++ b/apps/regression/calculation_controller.cpp @@ -129,7 +129,7 @@ void CalculationController::willDisplayCellAtLocation(HighlightCell * cell, int if (i == 0) { if (j == numberOfRows()-1) { EvenOddExpressionCell * myCell = (EvenOddExpressionCell *)cell; - myCell->setExpression(m_r2Layout); + myCell->setExpressionLayout(m_r2Layout); return; } EvenOddMessageTextCell * myCell = (EvenOddMessageTextCell *)cell; diff --git a/apps/regression/store_controller.cpp b/apps/regression/store_controller.cpp index 62e2e4400..59617a330 100644 --- a/apps/regression/store_controller.cpp +++ b/apps/regression/store_controller.cpp @@ -34,7 +34,7 @@ void StoreController::willDisplayCellAtLocation(HighlightCell * cell, int i, int return; } EvenOddExpressionCell * mytitleCell = (EvenOddExpressionCell *)cell; - mytitleCell->setExpression(m_titleLayout[i]); + mytitleCell->setExpressionLayout(m_titleLayout[i]); } HighlightCell * StoreController::titleCells(int index) { diff --git a/apps/sequence/graph/term_sum_controller.cpp b/apps/sequence/graph/term_sum_controller.cpp index a22e729e0..cc136bd87 100644 --- a/apps/sequence/graph/term_sum_controller.cpp +++ b/apps/sequence/graph/term_sum_controller.cpp @@ -201,7 +201,7 @@ void TermSumController::LegendView::setSumSubscript(float start) { char buffer[PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits)]; Complex::convertFloatToText(start, buffer, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits), Constant::LargeNumberOfSignificantDigits, Expression::FloatDisplayMode::Decimal); m_sumLayout = new CondensedSumLayout(new StringLayout(sigma, sizeof(sigma)), new StringLayout(buffer, strlen(buffer), KDText::FontSize::Small), nullptr); - m_sum.setExpression(m_sumLayout); + m_sum.setExpressionLayout(m_sumLayout); m_sum.setAlignment(0.0f, 0.5f); } @@ -216,7 +216,7 @@ void TermSumController::LegendView::setSumSuperscript(float start, float end) { char bufferEnd[PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits)]; Complex::convertFloatToText(end, bufferEnd, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits), Constant::LargeNumberOfSignificantDigits, Expression::FloatDisplayMode::Decimal); m_sumLayout = new CondensedSumLayout(new StringLayout(sigma, sizeof(sigma)), new StringLayout(bufferStart, strlen(bufferStart), KDText::FontSize::Small), new StringLayout(bufferEnd, strlen(bufferEnd), KDText::FontSize::Small)); - m_sum.setExpression(m_sumLayout); + m_sum.setExpressionLayout(m_sumLayout); m_sum.setAlignment(0.0f, 0.5f); } @@ -229,7 +229,7 @@ void TermSumController::LegendView::setSumResult(const char * sequenceName, doub childrenLayouts[1] = new BaselineRelativeLayout(new StringLayout(sequenceName, 1, KDText::FontSize::Small), new StringLayout("n", 1, KDText::FontSize::Small), BaselineRelativeLayout::Type::Subscript); childrenLayouts[0] = m_sumLayout; m_sumLayout = new HorizontalLayout(childrenLayouts, 3); - m_sum.setExpression(m_sumLayout); + m_sum.setExpressionLayout(m_sumLayout); m_sum.setAlignment(0.5f, 0.5f); } diff --git a/apps/sequence/list/list_controller.cpp b/apps/sequence/list/list_controller.cpp index 29eefaf32..c3a8e6031 100644 --- a/apps/sequence/list/list_controller.cpp +++ b/apps/sequence/list/list_controller.cpp @@ -169,13 +169,13 @@ void ListController::willDisplayTitleCellAtIndex(HighlightCell * cell, int j) { SequenceTitleCell * myCell = (SequenceTitleCell *)cell; Sequence * sequence = m_sequenceStore->functionAtIndex(functionIndexForRow(j)); if (sequenceDefinitionForRow(j) == 0) { - myCell->setExpression(sequence->definitionName()); + myCell->setExpressionLayout(sequence->definitionName()); } if (sequenceDefinitionForRow(j) == 1) { - myCell->setExpression(sequence->firstInitialConditionName()); + myCell->setExpressionLayout(sequence->firstInitialConditionName()); } if (sequenceDefinitionForRow(j) == 2) { - myCell->setExpression(sequence->secondInitialConditionName()); + myCell->setExpressionLayout(sequence->secondInitialConditionName()); } KDColor nameColor = sequence->isActive() ? sequence->color() : Palette::GreyDark; myCell->setColor(nameColor); @@ -185,13 +185,13 @@ void ListController::willDisplayExpressionCellAtIndex(HighlightCell * cell, int FunctionExpressionCell * myCell = (FunctionExpressionCell *)cell; Sequence * sequence = m_sequenceStore->functionAtIndex(functionIndexForRow(j)); if (sequenceDefinitionForRow(j) == 0) { - myCell->setExpression(sequence->layout()); + myCell->setExpressionLayout(sequence->layout()); } if (sequenceDefinitionForRow(j) == 1) { - myCell->setExpression(sequence->firstInitialConditionLayout()); + myCell->setExpressionLayout(sequence->firstInitialConditionLayout()); } if (sequenceDefinitionForRow(j) == 2) { - myCell->setExpression(sequence->secondInitialConditionLayout()); + myCell->setExpressionLayout(sequence->secondInitialConditionLayout()); } bool active = sequence->isActive(); KDColor textColor = active ? KDColorBlack : Palette::GreyDark; diff --git a/apps/sequence/list/list_parameter_controller.cpp b/apps/sequence/list/list_parameter_controller.cpp index 075d96581..d466fa330 100644 --- a/apps/sequence/list/list_parameter_controller.cpp +++ b/apps/sequence/list/list_parameter_controller.cpp @@ -103,7 +103,7 @@ void ListParameterController::willDisplayCellForIndex(HighlightCell * cell, int cell->setHighlighted(index == selectedRow()); // See FIXME in SelectableTableView::reloadData() Shared::ListParameterController::willDisplayCellForIndex(cell, index); if (cell == &m_typeCell && m_sequence != nullptr) { - m_typeCell.setExpression(m_sequence->definitionName()); + m_typeCell.setExpressionLayout(m_sequence->definitionName()); } if (cell == &m_initialRankCell && m_sequence != nullptr) { MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *) cell; diff --git a/apps/sequence/list/sequence_toolbox.cpp b/apps/sequence/list/sequence_toolbox.cpp index 708e670d6..ed5a3f49b 100644 --- a/apps/sequence/list/sequence_toolbox.cpp +++ b/apps/sequence/list/sequence_toolbox.cpp @@ -54,7 +54,7 @@ HighlightCell * SequenceToolbox::reusableCell(int index, int type) { void SequenceToolbox::willDisplayCellForIndex(HighlightCell * cell, int index) { if (typeAtLocation(0, index) == 2) { ExpressionTableCell * myCell = (ExpressionTableCell *)cell; - myCell->setExpression(m_addedCellLayout[index]); + myCell->setExpressionLayout(m_addedCellLayout[index]); return; } else { MathToolbox::willDisplayCellForIndex(cell, mathToolboxIndex(index)); diff --git a/apps/sequence/list/type_parameter_controller.cpp b/apps/sequence/list/type_parameter_controller.cpp index 29e3ec3d6..037aaa98f 100644 --- a/apps/sequence/list/type_parameter_controller.cpp +++ b/apps/sequence/list/type_parameter_controller.cpp @@ -122,7 +122,7 @@ void TypeParameterController::willDisplayCellAtLocation(HighlightCell * cell, in } m_expressionLayouts[j] = new BaselineRelativeLayout(new StringLayout(nextName, 1, size), new StringLayout(subscripts[j], strlen(subscripts[j]), KDText::FontSize::Small), BaselineRelativeLayout::Type::Subscript); ExpressionTableCellWithPointer * myCell = (ExpressionTableCellWithPointer *)cell; - myCell->setExpression(m_expressionLayouts[j]); + myCell->setExpressionLayout(m_expressionLayouts[j]); } void TypeParameterController::setSequence(Sequence * sequence) { diff --git a/apps/sequence/sequence_title_cell.cpp b/apps/sequence/sequence_title_cell.cpp index 3f86911d0..7138d103f 100644 --- a/apps/sequence/sequence_title_cell.cpp +++ b/apps/sequence/sequence_title_cell.cpp @@ -12,8 +12,8 @@ SequenceTitleCell::SequenceTitleCell(Orientation orientation) : { } -void SequenceTitleCell::setExpression(Poincare::ExpressionLayout * expressionLayout) { - m_titleTextView.setExpression(expressionLayout); +void SequenceTitleCell::setExpressionLayout(Poincare::ExpressionLayout * expressionLayout) { + m_titleTextView.setExpressionLayout(expressionLayout); } void SequenceTitleCell::setHighlighted(bool highlight) { diff --git a/apps/sequence/sequence_title_cell.h b/apps/sequence/sequence_title_cell.h index 253c43902..1fe659c07 100644 --- a/apps/sequence/sequence_title_cell.h +++ b/apps/sequence/sequence_title_cell.h @@ -8,7 +8,7 @@ namespace Sequence { class SequenceTitleCell : public Shared::FunctionTitleCell { public: SequenceTitleCell(Orientation orientation); - void setExpression(Poincare::ExpressionLayout * expressionLayout); + void setExpressionLayout(Poincare::ExpressionLayout * expressionLayout); void setEven(bool even) override; void setHighlighted(bool highlight) override; void setColor(KDColor color) override; diff --git a/apps/sequence/values/values_controller.cpp b/apps/sequence/values/values_controller.cpp index 184685a91..0a1bc8f94 100644 --- a/apps/sequence/values/values_controller.cpp +++ b/apps/sequence/values/values_controller.cpp @@ -30,7 +30,7 @@ void ValuesController::willDisplayCellAtLocation(HighlightCell * cell, int i, in if (j == 0 && i > 0) { SequenceTitleCell * myCell = (SequenceTitleCell *)cell; Sequence * sequence = m_sequenceStore->activeFunctionAtIndex(i-1); - myCell->setExpression(sequence->nameLayout()); + myCell->setExpressionLayout(sequence->nameLayout()); myCell->setColor(sequence->color()); } } diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 4b7dc6768..32a0f7c80 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -183,7 +183,7 @@ void MainController::willDisplayCellForIndex(HighlightCell * cell, int index) { m_complexFormatLayout = new BaselineRelativeLayout(new StringLayout(base, sizeof(base), KDText::FontSize::Small), new StringLayout(superscript, sizeof(superscript), KDText::FontSize::Small), BaselineRelativeLayout::Type::Superscript); } MessageTableCellWithChevronAndExpression * myExpCell = (MessageTableCellWithChevronAndExpression *)cell; - myExpCell->setExpression(m_complexFormatLayout); + myExpCell->setExpressionLayout(m_complexFormatLayout); return; } if (index == 3) { diff --git a/apps/settings/sub_controller.cpp b/apps/settings/sub_controller.cpp index 9ea464dfb..6d5b8ec4e 100644 --- a/apps/settings/sub_controller.cpp +++ b/apps/settings/sub_controller.cpp @@ -28,7 +28,7 @@ SubController::SubController(Responder * parentResponder) : const char superscript[] = {Ion::Charset::IComplex, Ion::Charset::SmallTheta, ' '}; m_complexFormatLayout[1] = new BaselineRelativeLayout(new StringLayout(base, sizeof(base)), new StringLayout(superscript, sizeof(superscript)), BaselineRelativeLayout::Type::Superscript); for (int i = 0; i < 2; i++) { - m_complexFormatCells[i].setExpression(m_complexFormatLayout[i]); + m_complexFormatCells[i].setExpressionLayout(m_complexFormatLayout[i]); } m_editableCell.setMessage(I18n::Message::SignificantFigures); m_editableCell.setMessageFontSize(KDText::FontSize::Large); diff --git a/apps/shared/function_expression_cell.cpp b/apps/shared/function_expression_cell.cpp index fee970761..c9345ee71 100644 --- a/apps/shared/function_expression_cell.cpp +++ b/apps/shared/function_expression_cell.cpp @@ -11,8 +11,8 @@ FunctionExpressionCell::FunctionExpressionCell() : { } -void FunctionExpressionCell::setExpression(ExpressionLayout * expressionLayout) { - m_expressionView.setExpression(expressionLayout); +void FunctionExpressionCell::setExpressionLayout(ExpressionLayout * expressionLayout) { + m_expressionView.setExpressionLayout(expressionLayout); } void FunctionExpressionCell::setTextColor(KDColor textColor) { diff --git a/apps/shared/function_expression_cell.h b/apps/shared/function_expression_cell.h index 0b2288f56..351bbe360 100644 --- a/apps/shared/function_expression_cell.h +++ b/apps/shared/function_expression_cell.h @@ -9,7 +9,7 @@ namespace Shared { class FunctionExpressionCell : public EvenOddCell { public: FunctionExpressionCell(); - void setExpression(Poincare::ExpressionLayout * expressionLayout); + void setExpressionLayout(Poincare::ExpressionLayout * expressionLayout); void setTextColor(KDColor color); void setEven(bool even) override; void setHighlighted(bool highlight) override; diff --git a/apps/variable_box_leaf_cell.cpp b/apps/variable_box_leaf_cell.cpp index 6806d64fc..cc7a60983 100644 --- a/apps/variable_box_leaf_cell.cpp +++ b/apps/variable_box_leaf_cell.cpp @@ -91,7 +91,7 @@ void VariableBoxLeafCell::setExpression(const Expression * expression) { if (expression) { m_expressionLayout = expression->createLayout(); } - m_expressionView.setExpression(m_expressionLayout); + m_expressionView.setExpressionLayout(m_expressionLayout); } void VariableBoxLeafCell::drawRect(KDContext * ctx, KDRect rect) const { diff --git a/escher/include/escher/even_odd_expression_cell.h b/escher/include/escher/even_odd_expression_cell.h index 05daf3818..157981777 100644 --- a/escher/include/escher/even_odd_expression_cell.h +++ b/escher/include/escher/even_odd_expression_cell.h @@ -10,7 +10,7 @@ public: KDColor textColor = KDColorBlack, KDColor backgroundColor = KDColorWhite); void setEven(bool even) override; void setHighlighted(bool highlight) override; - void setExpression(Poincare::ExpressionLayout * expressionLayout); + void setExpressionLayout(Poincare::ExpressionLayout * expressionLayout); void setBackgroundColor(KDColor backgroundColor); void setTextColor(KDColor textColor); KDSize minimalSizeForOptimalDisplay() const override; diff --git a/escher/include/escher/expression_table_cell.h b/escher/include/escher/expression_table_cell.h index 0bd233a33..4318dc603 100644 --- a/escher/include/escher/expression_table_cell.h +++ b/escher/include/escher/expression_table_cell.h @@ -9,7 +9,7 @@ public: ExpressionTableCell(Layout layout = Layout::Horizontal); View * labelView() const override; void setHighlighted(bool highlight) override; - void setExpression(Poincare::ExpressionLayout * expressionLayout); + void setExpressionLayout(Poincare::ExpressionLayout * expressionLayout); private: ExpressionView m_labelExpressionView; }; diff --git a/escher/include/escher/expression_view.h b/escher/include/escher/expression_view.h index f5632a453..0b3888d9e 100644 --- a/escher/include/escher/expression_view.h +++ b/escher/include/escher/expression_view.h @@ -16,7 +16,7 @@ public: ExpressionView(float horizontalAlignment = 0.0f, float verticalAlignment = 0.5f, KDColor textColor = KDColorBlack, KDColor backgroundColor = KDColorWhite); Poincare::ExpressionLayout * expressionLayout() const; - void setExpression(Poincare::ExpressionLayout * expressionLayout); + void setExpressionLayout(Poincare::ExpressionLayout * expressionLayout); void drawRect(KDContext * ctx, KDRect rect) const override; void setBackgroundColor(KDColor backgroundColor); void setTextColor(KDColor textColor); diff --git a/escher/include/escher/message_table_cell_with_chevron_and_expression.h b/escher/include/escher/message_table_cell_with_chevron_and_expression.h index e1423629a..ae8b45c7d 100644 --- a/escher/include/escher/message_table_cell_with_chevron_and_expression.h +++ b/escher/include/escher/message_table_cell_with_chevron_and_expression.h @@ -9,7 +9,7 @@ public: 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); + void setExpressionLayout(Poincare::ExpressionLayout * expressionLayout); private: ExpressionView m_subtitleView; }; diff --git a/escher/src/even_odd_expression_cell.cpp b/escher/src/even_odd_expression_cell.cpp index 75e076768..4fb2e8739 100644 --- a/escher/src/even_odd_expression_cell.cpp +++ b/escher/src/even_odd_expression_cell.cpp @@ -19,8 +19,8 @@ void EvenOddExpressionCell::setEven(bool even) { m_expressionView.setBackgroundColor(backgroundColor()); } -void EvenOddExpressionCell::setExpression(ExpressionLayout * expressionLayout) { - m_expressionView.setExpression(expressionLayout); +void EvenOddExpressionCell::setExpressionLayout(ExpressionLayout * expressionLayout) { + m_expressionView.setExpressionLayout(expressionLayout); } void EvenOddExpressionCell::setBackgroundColor(KDColor backgroundColor) { diff --git a/escher/src/expression_table_cell.cpp b/escher/src/expression_table_cell.cpp index 136fddb41..2d27687ec 100644 --- a/escher/src/expression_table_cell.cpp +++ b/escher/src/expression_table_cell.cpp @@ -18,7 +18,7 @@ void ExpressionTableCell::setHighlighted(bool highlight) { m_labelExpressionView.setBackgroundColor(backgroundColor); } -void ExpressionTableCell::setExpression(Poincare::ExpressionLayout * expressionLayout) { - m_labelExpressionView.setExpression(expressionLayout); +void ExpressionTableCell::setExpressionLayout(Poincare::ExpressionLayout * expressionLayout) { + m_labelExpressionView.setExpressionLayout(expressionLayout); layoutSubviews(); } diff --git a/escher/src/expression_view.cpp b/escher/src/expression_view.cpp index cc5c27a3a..2686d7688 100644 --- a/escher/src/expression_view.cpp +++ b/escher/src/expression_view.cpp @@ -15,7 +15,7 @@ ExpressionLayout * ExpressionView::expressionLayout() const { return m_expressionLayout; } -void ExpressionView::setExpression(ExpressionLayout * expressionLayout) { +void ExpressionView::setExpressionLayout(ExpressionLayout * expressionLayout) { m_expressionLayout = expressionLayout; markRectAsDirty(bounds()); } diff --git a/escher/src/message_table_cell_with_chevron_and_expression.cpp b/escher/src/message_table_cell_with_chevron_and_expression.cpp index d3e46ee75..9d8dc1cb0 100644 --- a/escher/src/message_table_cell_with_chevron_and_expression.cpp +++ b/escher/src/message_table_cell_with_chevron_and_expression.cpp @@ -17,8 +17,8 @@ void MessageTableCellWithChevronAndExpression::setHighlighted(bool highlight) { m_subtitleView.setBackgroundColor(backgroundColor); } -void MessageTableCellWithChevronAndExpression::setExpression(Poincare::ExpressionLayout * expressionLayout) { - m_subtitleView.setExpression(expressionLayout); +void MessageTableCellWithChevronAndExpression::setExpressionLayout(Poincare::ExpressionLayout * expressionLayout) { + m_subtitleView.setExpressionLayout(expressionLayout); reloadCell(); layoutSubviews(); }