From 200364e9d97aa8a82903c06fdfae1fe96c985421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Wed, 8 Feb 2017 17:12:20 +0100 Subject: [PATCH] [apps/sequence/list] Change the list parameter to controller to the one specific to sequence app Change-Id: I879a8cb42231bba2a2607953d1e4808aafa463d9 --- apps/sequence/list/list_controller.h | 6 +++--- apps/sequence/list/list_parameter_controller.cpp | 1 + apps/sequence/list/sequence_title_cell.cpp | 4 ++-- apps/sequence/list/sequence_title_cell.h | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/sequence/list/list_controller.h b/apps/sequence/list/list_controller.h index e8f74f623..8849288de 100644 --- a/apps/sequence/list/list_controller.h +++ b/apps/sequence/list/list_controller.h @@ -8,7 +8,7 @@ #include "type_parameter_controller.h" #include "../../shared/new_function_cell.h" #include "../../shared/list_controller.h" -#include "../../shared/list_parameter_controller.h" +#include "list_parameter_controller.h" namespace Sequence { @@ -21,7 +21,7 @@ public: void tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY) override; private: static constexpr KDCoordinate k_emptySubRowHeight = 30; - Shared::ListParameterController * parameterController() override; + ListParameterController * parameterController() override; int maxNumberOfRows() override; TableViewCell * titleCells(int index) override; TableViewCell * expressionCells(int index) override; @@ -30,7 +30,7 @@ private: constexpr static int k_maxNumberOfRows = 3; SequenceTitleCell m_functionTitleCells[k_maxNumberOfRows]; SequenceExpressionCell m_expressionCells[k_maxNumberOfRows]; - Shared::ListParameterController m_parameterController; + ListParameterController m_parameterController; TypeParameterController m_typeParameterController; StackViewController m_typeStackController; }; diff --git a/apps/sequence/list/list_parameter_controller.cpp b/apps/sequence/list/list_parameter_controller.cpp index 72212a60a..65da9d4b9 100644 --- a/apps/sequence/list/list_parameter_controller.cpp +++ b/apps/sequence/list/list_parameter_controller.cpp @@ -19,6 +19,7 @@ ListParameterController::~ListParameterController() { delete m_typeLayout; } } + const char * ListParameterController::title() const { return "Options de la suite"; } diff --git a/apps/sequence/list/sequence_title_cell.cpp b/apps/sequence/list/sequence_title_cell.cpp index 43bf3b188..335506263 100644 --- a/apps/sequence/list/sequence_title_cell.cpp +++ b/apps/sequence/list/sequence_title_cell.cpp @@ -4,7 +4,7 @@ using namespace Shared; namespace Sequence { -SequenceTitleCell::SequenceTitleCell(Responder * parentResponder, Shared::ListParameterController * listParameterController) : +SequenceTitleCell::SequenceTitleCell(Responder * parentResponder, ListParameterController * listParameterController) : SequenceCell(parentResponder), m_backgroungCell(FunctionTitleCell(FunctionTitleCell::Orientation::VerticalIndicator)), m_definitionView(KDText::FontSize::Large, 0.5f, 0.5f), @@ -76,7 +76,7 @@ bool SequenceTitleCell::handleEvent(Ion::Events::Event event) { } if (event == Ion::Events::OK) { StackViewController * stack = stackController(); - m_listParameterController->setFunction(m_sequence); + m_listParameterController->setSequence(m_sequence); stack->push(m_listParameterController); SelectableTableView * table = (SelectableTableView *)parentResponder(); table->dataHasChanged(true); diff --git a/apps/sequence/list/sequence_title_cell.h b/apps/sequence/list/sequence_title_cell.h index fa5713428..525a0dbd1 100644 --- a/apps/sequence/list/sequence_title_cell.h +++ b/apps/sequence/list/sequence_title_cell.h @@ -2,7 +2,7 @@ #define SEQUENCE_SEQUENCE_TITLE_CELL_H #include "../../shared/function_title_cell.h" -#include "../../shared/list_parameter_controller.h" +#include "list_parameter_controller.h" #include "../sequence.h" #include "sequence_cell.h" @@ -10,7 +10,7 @@ namespace Sequence { class SequenceTitleCell : public SequenceCell { public: - SequenceTitleCell(Responder * parentResponder, Shared::ListParameterController * listParameterController); + SequenceTitleCell(Responder * parentResponder, ListParameterController * listParameterController); void setSequence(Sequence * sequence) override; void setColor(KDColor color); int numberOfSubviews() const override; @@ -25,7 +25,7 @@ private: EvenOddBufferTextCell m_definitionView; EvenOddBufferTextCell m_firstInitialConditionView; EvenOddBufferTextCell m_secondInitialConditionView; - Shared::ListParameterController * m_listParameterController; + ListParameterController * m_listParameterController; }; }