diff --git a/escher/include/escher/stack_view_controller.h b/escher/include/escher/stack_view_controller.h index 02d6318fc..48bf9a114 100644 --- a/escher/include/escher/stack_view_controller.h +++ b/escher/include/escher/stack_view_controller.h @@ -16,8 +16,8 @@ public: void push(ViewController * vc, KDColor textColor = Palette::SubTab, KDColor backgroundColor = KDColorWhite, KDColor separatorColor = Palette::GreyBright); void pop(); - int depth(); - View * view() override; + int depth() const { return m_numberOfChildren; } + View * view() override { return &m_view; } ViewController * topViewController(); const char * title() override; bool handleEvent(Ion::Events::Event event) override; diff --git a/escher/src/stack_view_controller.cpp b/escher/src/stack_view_controller.cpp index 2b88c2288..1b32e0879 100644 --- a/escher/src/stack_view_controller.cpp +++ b/escher/src/stack_view_controller.cpp @@ -129,10 +129,6 @@ void StackViewController::pop() { vc->viewDidDisappear(); } -int StackViewController::depth() { - return m_numberOfChildren; -} - void StackViewController::pushModel(Frame frame) { m_childrenFrame[m_numberOfChildren++] = frame; } @@ -160,10 +156,6 @@ bool StackViewController::handleEvent(Ion::Events::Event event) { return false; } -View * StackViewController::view() { - return &m_view; -} - void StackViewController::initView() { m_childrenFrame[0].viewController()->initView(); }