From 1be0dc8b67934b4abf97269833103bbbb767af04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Wed, 1 Mar 2017 17:33:13 +0100 Subject: [PATCH] [escher] Change name: didResignFirstResponder->willResignFirstResponder Change-Id: Ie630f8a2a146bd01d6a2d5075a522edae28005be --- escher/include/escher/responder.h | 2 +- escher/include/escher/tab_view_controller.h | 2 +- escher/src/app.cpp | 2 +- escher/src/responder.cpp | 2 +- escher/src/tab_view_controller.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/escher/include/escher/responder.h b/escher/include/escher/responder.h index 96cf22c5e..8cedee460 100644 --- a/escher/include/escher/responder.h +++ b/escher/include/escher/responder.h @@ -11,7 +11,7 @@ public: Responder(Responder * parentResponder); virtual bool handleEvent(Ion::Events::Event event); // Default implementation does nothing virtual void didBecomeFirstResponder(); - virtual void didResignFirstResponder(); + virtual void willResignFirstResponder(); Responder * parentResponder() const; void setParentResponder(Responder * responder); diff --git a/escher/include/escher/tab_view_controller.h b/escher/include/escher/tab_view_controller.h index 3ae00087a..7b464b61b 100644 --- a/escher/include/escher/tab_view_controller.h +++ b/escher/include/escher/tab_view_controller.h @@ -16,7 +16,7 @@ public: const char * tabName(uint8_t index); bool handleEvent(Ion::Events::Event event) override; void didBecomeFirstResponder() override; - void didResignFirstResponder() override; + void willResignFirstResponder() override; void viewWillAppear() override; void viewWillDisappear() override; private: diff --git a/escher/src/app.cpp b/escher/src/app.cpp index 31c00c847..3fa3b9106 100644 --- a/escher/src/app.cpp +++ b/escher/src/app.cpp @@ -35,7 +35,7 @@ Responder * App::firstResponder() { void App::setFirstResponder(Responder * responder) { if (m_firstResponder) { - m_firstResponder->didResignFirstResponder(); + m_firstResponder->willResignFirstResponder(); } m_firstResponder = responder; if (m_firstResponder) { diff --git a/escher/src/responder.cpp b/escher/src/responder.cpp index 88a0af353..863ba24fe 100644 --- a/escher/src/responder.cpp +++ b/escher/src/responder.cpp @@ -28,7 +28,7 @@ bool Responder::handleEvent(Ion::Events::Event event) { void Responder::didBecomeFirstResponder() { } -void Responder::didResignFirstResponder() { +void Responder::willResignFirstResponder() { } /* We assume the app is the root parent. */ diff --git a/escher/src/tab_view_controller.cpp b/escher/src/tab_view_controller.cpp index 86438ce0c..5ecf8e026 100644 --- a/escher/src/tab_view_controller.cpp +++ b/escher/src/tab_view_controller.cpp @@ -121,7 +121,7 @@ void TabViewController::didBecomeFirstResponder() { setSelectedTab(m_activeChildIndex); } -void TabViewController::didResignFirstResponder() { +void TabViewController::willResignFirstResponder() { setSelectedTab(-1); }