From ae947b456d30600cee92511f94a3d1b49ac190b1 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Wed, 29 May 2013 18:39:22 +0200 Subject: [PATCH] remove BufferIterator::offset --- src/buffer.hh | 1 - src/buffer_iterator.inl.hh | 6 ------ src/input_handler.cc | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/buffer.hh b/src/buffer.hh index 52475ffb..de37cc1c 100644 --- a/src/buffer.hh +++ b/src/buffer.hh @@ -71,7 +71,6 @@ public: const BufferCoord& coord() const { return m_coord; } LineCount line() const { return m_coord.line; } ByteCount column() const { return m_coord.column; } - ByteCount offset() const; private: safe_ptr m_buffer; diff --git a/src/buffer_iterator.inl.hh b/src/buffer_iterator.inl.hh index ac02f022..7008e0ec 100644 --- a/src/buffer_iterator.inl.hh +++ b/src/buffer_iterator.inl.hh @@ -68,12 +68,6 @@ inline char BufferIterator::operator*() const return m_buffer->at(m_coord); } -inline ByteCount BufferIterator::offset() const -{ - kak_assert(m_buffer); - return m_buffer->offset(m_coord); -} - inline size_t BufferIterator::operator-(const BufferIterator& iterator) const { kak_assert(m_buffer == iterator.m_buffer); diff --git a/src/input_handler.cc b/src/input_handler.cc index 1d98120d..2752157f 100644 --- a/src/input_handler.cc +++ b/src/input_handler.cc @@ -605,7 +605,7 @@ public: BufferIterator begin{buffer, m_completions.begin}; for (auto& sel : m_context.editor().selections()) { - auto offset = sel.last().offset(); + auto offset = buffer.offset(sel.last()); if (offset > beg_offset and offset + end_offset < buffer_len and std::equal(sel.last() - beg_offset, sel.last(), begin)) {