From cf68a9ed186f5d4bc6bad3c67ffd37ad6b2342d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Fri, 28 Sep 2018 11:30:52 +0200 Subject: [PATCH] [shared] Change TextFieldDelegateApp::XNT() signature --- apps/calculation/app.cpp | 4 ++-- apps/calculation/app.h | 2 +- apps/graph/app.cpp | 4 ++-- apps/graph/app.h | 2 +- apps/sequence/app.cpp | 4 ++-- apps/sequence/app.h | 2 +- apps/shared/expression_field_delegate_app.cpp | 2 +- apps/shared/text_field_delegate_app.cpp | 6 +++--- apps/shared/text_field_delegate_app.h | 2 +- apps/solver/app.cpp | 4 ++-- apps/solver/app.h | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/calculation/app.cpp b/apps/calculation/app.cpp index f17fe35e1..c571db138 100644 --- a/apps/calculation/app.cpp +++ b/apps/calculation/app.cpp @@ -107,8 +107,8 @@ bool App::textInputIsCorrect(const char * text) { return true; } -const char * App::XNT() { - return "x"; +char App::XNT() { + return 'x'; } } diff --git a/apps/calculation/app.h b/apps/calculation/app.h index 47fbf40f7..0a665ba0e 100644 --- a/apps/calculation/app.h +++ b/apps/calculation/app.h @@ -30,7 +30,7 @@ public: bool textFieldDidReceiveEvent(::TextField * textField, Ion::Events::Event event) override; bool textInputIsCorrect(const char * text); bool layoutFieldDidReceiveEvent(::LayoutField * layoutField, Ion::Events::Event event) override; - const char * XNT() override; + char XNT() override; private: App(Container * container, Snapshot * snapshot); HistoryController m_historyController; diff --git a/apps/graph/app.cpp b/apps/graph/app.cpp index 91e1bcdb3..c9555e164 100644 --- a/apps/graph/app.cpp +++ b/apps/graph/app.cpp @@ -78,8 +78,8 @@ InputViewController * App::inputViewController() { return &m_inputViewController; } -const char * App::XNT() { - return "x"; +char App::XNT() { + return 'x'; } } diff --git a/apps/graph/app.h b/apps/graph/app.h index 920a09b34..1b2a4b3c0 100644 --- a/apps/graph/app.h +++ b/apps/graph/app.h @@ -32,7 +32,7 @@ public: Shared::InteractiveCurveViewRange m_graphRange; }; InputViewController * inputViewController() override; - const char * XNT() override; + char XNT() override; private: App(Container * container, Snapshot * snapshot); ListController m_listController; diff --git a/apps/sequence/app.cpp b/apps/sequence/app.cpp index a10460084..f5478b3dc 100644 --- a/apps/sequence/app.cpp +++ b/apps/sequence/app.cpp @@ -83,8 +83,8 @@ SequenceContext * App::localContext() { return &m_sequenceContext; } -const char * App::XNT() { - return "n"; +char App::XNT() { + return 'n'; } } diff --git a/apps/sequence/app.h b/apps/sequence/app.h index 064a28c96..c3f71836c 100644 --- a/apps/sequence/app.h +++ b/apps/sequence/app.h @@ -35,7 +35,7 @@ public: }; InputViewController * inputViewController() override; SequenceContext * localContext() override; - const char * XNT() override; + char XNT() override; private: App(Container * container, Snapshot * snapshot); SequenceContext m_sequenceContext; diff --git a/apps/shared/expression_field_delegate_app.cpp b/apps/shared/expression_field_delegate_app.cpp index 6b737e92e..0ae6826c0 100644 --- a/apps/shared/expression_field_delegate_app.cpp +++ b/apps/shared/expression_field_delegate_app.cpp @@ -14,7 +14,7 @@ ExpressionFieldDelegateApp::ExpressionFieldDelegateApp(Container * container, Sn } char ExpressionFieldDelegateApp::privateXNT(LayoutField * layoutField) { - return layoutField->XNTChar(XNT()[0]); + return layoutField->XNTChar(XNT()); } bool ExpressionFieldDelegateApp::layoutFieldShouldFinishEditing(LayoutField * layoutField, Ion::Events::Event event) { diff --git a/apps/shared/text_field_delegate_app.cpp b/apps/shared/text_field_delegate_app.cpp index c2ed14bbd..da8132740 100644 --- a/apps/shared/text_field_delegate_app.cpp +++ b/apps/shared/text_field_delegate_app.cpp @@ -21,8 +21,8 @@ AppsContainer * TextFieldDelegateApp::container() { return (AppsContainer *)app()->container(); } -const char * TextFieldDelegateApp::XNT() { - return "X"; +char TextFieldDelegateApp::XNT() { + return 'X'; } bool TextFieldDelegateApp::textFieldShouldFinishEditing(TextField * textField, Ion::Events::Event event) { @@ -85,7 +85,7 @@ bool TextFieldDelegateApp::displayVariableBoxController(Responder * sender) { /* Private */ char TextFieldDelegateApp::privateXNT(TextField * textField) { - return textField->XNTChar(XNT()[0]); + return textField->XNTChar(XNT()); } } diff --git a/apps/shared/text_field_delegate_app.h b/apps/shared/text_field_delegate_app.h index 85a2ac13a..58bdb45ed 100644 --- a/apps/shared/text_field_delegate_app.h +++ b/apps/shared/text_field_delegate_app.h @@ -14,7 +14,7 @@ public: virtual ~TextFieldDelegateApp() = default; virtual Poincare::Context * localContext(); AppsContainer * container(); - virtual const char * XNT(); + virtual char XNT(); bool textFieldShouldFinishEditing(TextField * textField, Ion::Events::Event event) override; virtual bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override; Toolbox * toolboxForTextInput(TextInput * textInput) override; diff --git a/apps/solver/app.cpp b/apps/solver/app.cpp index 024896588..eb486cd45 100644 --- a/apps/solver/app.cpp +++ b/apps/solver/app.cpp @@ -64,8 +64,8 @@ void App::willBecomeInactive() { ::App::willBecomeInactive(); } -const char * App::XNT() { - return "x"; +char App::XNT() { + return 'x'; } } diff --git a/apps/solver/app.h b/apps/solver/app.h index a1cfc313d..048871cfd 100644 --- a/apps/solver/app.h +++ b/apps/solver/app.h @@ -33,7 +33,7 @@ public: ViewController * solutionsControllerStack() { return &m_alternateEmptyViewController; } ViewController * intervalController() { return &m_intervalController; } void willBecomeInactive() override; - const char * XNT() override; + char XNT() override; private: App(Container * container, Snapshot * snapshot); SolutionsController m_solutionsController;