From c36ee924eb478e1d8f88eccbc1f0db800d446b92 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Tue, 25 Sep 2012 14:23:50 +0200 Subject: [PATCH] cleanup BatchUI --- src/commands.cc | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/commands.cc b/src/commands.cc index c8445e15..6211a1b7 100644 --- a/src/commands.cc +++ b/src/commands.cc @@ -653,26 +653,21 @@ class BatchUI : public UserInterface { public: BatchUI(const KeyList& keys) - : m_keys(keys), m_pos(0) - { - } + : m_keys(keys), m_pos(0) {} Key get_key() override { - if (m_pos >= m_keys.size()) - throw runtime_error("no more characters"); + assert(m_pos < m_keys.size()); return m_keys[m_pos++]; } + bool has_key_left() const { return m_pos < m_keys.size(); } - void print_status(const String& status, CharCount cursor_pos) override {} - void draw_window(Window& window) override {} - + void print_status(const String& , CharCount) override {} + void draw_window(Window&) override {} void menu_show(const memoryview&) override {} void menu_select(int) override {} void menu_hide() override {} - bool has_key_left() const { return m_pos < m_keys.size(); } - private: const KeyList& m_keys; size_t m_pos;