diff --git a/apps/graph/app.cpp b/apps/graph/app.cpp index 36ad09e55..3dfa83842 100644 --- a/apps/graph/app.cpp +++ b/apps/graph/app.cpp @@ -72,7 +72,7 @@ InputViewController * App::inputViewController() { return &m_inputViewController; } -char App::XNT() { +CodePoint App::XNT() { return 'x'; } diff --git a/apps/graph/app.h b/apps/graph/app.h index 52a73863c..0c27fe2de 100644 --- a/apps/graph/app.h +++ b/apps/graph/app.h @@ -34,7 +34,7 @@ public: return static_cast(Container::activeApp()); } InputViewController * inputViewController() override; - char XNT() override; + CodePoint XNT() override; NestedMenuController * variableBoxForInputEventHandler(InputEventHandler * textInput) override; CartesianFunctionStore * functionStore() override { return static_cast(Shared::FunctionApp::functionStore()); } private: diff --git a/apps/sequence/app.cpp b/apps/sequence/app.cpp index f6930fb4b..bce12ad8b 100644 --- a/apps/sequence/app.cpp +++ b/apps/sequence/app.cpp @@ -81,8 +81,4 @@ SequenceContext * App::localContext() { return &m_sequenceContext; } -char App::XNT() { - return 'n'; -} - } diff --git a/apps/sequence/app.h b/apps/sequence/app.h index ecfb28ab2..5fb0aacb0 100644 --- a/apps/sequence/app.h +++ b/apps/sequence/app.h @@ -39,7 +39,7 @@ public: InputViewController * inputViewController() override; // TODO: override variableBoxForInputEventHandler to lock sequence in the variable box once they appear there // NestedMenuController * variableBoxForInputEventHandler(InputEventHandler * textInput) override; - char XNT() override; + CodePoint XNT() override { return 'n'; } SequenceContext * localContext() override; SequenceStore * functionStore() override { return static_cast(Shared::FunctionApp::functionStore()); } private: diff --git a/apps/shared/text_field_delegate_app.cpp b/apps/shared/text_field_delegate_app.cpp index 0279167ff..8420cc394 100644 --- a/apps/shared/text_field_delegate_app.cpp +++ b/apps/shared/text_field_delegate_app.cpp @@ -14,10 +14,6 @@ Context * TextFieldDelegateApp::localContext() { return AppsContainer::sharedAppsContainer()->globalContext(); } -char TextFieldDelegateApp::XNT() { - return 'x'; -} - bool TextFieldDelegateApp::textFieldShouldFinishEditing(TextField * textField, Ion::Events::Event event) { return isFinishingEvent(event); } diff --git a/apps/shared/text_field_delegate_app.h b/apps/shared/text_field_delegate_app.h index 7b9ba14ab..c7341903b 100644 --- a/apps/shared/text_field_delegate_app.h +++ b/apps/shared/text_field_delegate_app.h @@ -14,7 +14,7 @@ class TextFieldDelegateApp : public InputEventHandlerDelegateApp, public TextFie public: virtual ~TextFieldDelegateApp() = default; virtual Poincare::Context * localContext(); - virtual char XNT(); + virtual CodePoint XNT() { return 'x'; } bool textFieldShouldFinishEditing(TextField * textField, Ion::Events::Event event) override; virtual bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override; bool isAcceptableText(const char * text);