diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2015-03-09 13:48:41 +0000 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2015-03-09 13:54:09 +0000 |
| commit | 1cec8df45e297a8136df6f293d4874ae6c6cb013 (patch) | |
| tree | 7d713ba554765093238c924bcc9a6eaf7bf240ec /src/input_handler.cc | |
| parent | 44f81d0b8b73367369de6be0757247a62876d4c1 (diff) | |
ArrayView content is not const anymore
As in upcoming std c++ array_view, ArrayView<T> points to mutable
data, use ArrayView<const T> or alias ConstArrayView<T> for const
data.
Diffstat (limited to 'src/input_handler.cc')
| -rw-r--r-- | src/input_handler.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/input_handler.cc b/src/input_handler.cc index 2f67953b..23717f88 100644 --- a/src/input_handler.cc +++ b/src/input_handler.cc @@ -342,7 +342,7 @@ private: class Menu : public InputMode { public: - Menu(InputHandler& input_handler, ArrayView<String> choices, + Menu(InputHandler& input_handler, ConstArrayView<String> choices, MenuCallback callback) : InputMode(input_handler), m_callback(callback), m_choices(choices.begin(), choices.end()), @@ -460,7 +460,7 @@ private: LineEditor m_filter_editor; }; -String common_prefix(ArrayView<String> strings) +String common_prefix(ConstArrayView<String> strings) { String res; if (strings.empty()) @@ -928,7 +928,7 @@ private: selections.sort_and_merge_overlapping(); } - void insert(ArrayView<String> strings) + void insert(ConstArrayView<String> strings) { context().selections().insert(strings, InsertMode::InsertCursor); } @@ -1096,7 +1096,7 @@ void InputHandler::set_prompt_face(Face prompt_face) prompt->set_prompt_face(prompt_face); } -void InputHandler::menu(ArrayView<String> choices, +void InputHandler::menu(ConstArrayView<String> choices, MenuCallback callback) { change_input_mode(new InputModes::Menu(*this, choices, callback)); @@ -1153,7 +1153,7 @@ bool InputHandler::is_recording() const void InputHandler::stop_recording() { kak_assert(m_recording_reg != 0); - RegisterManager::instance()[m_recording_reg] = ArrayView<String>(m_recorded_keys); + RegisterManager::instance()[m_recording_reg] = ConstArrayView<String>(m_recorded_keys); m_recording_reg = 0; } |