Simplify DocIterator

This commit is contained in:
Yuriy Skalko 2020-11-28 01:14:32 +02:00
parent 99b1488f0e
commit 19f5aa58aa
2 changed files with 14 additions and 24 deletions

View File

@ -44,23 +44,6 @@ using namespace lyx::support;
namespace lyx { namespace lyx {
DocIterator::DocIterator()
: boundary_(false), inset_(nullptr), buffer_(nullptr)
{}
// We could be able to get rid of this if only every BufferView were
// associated to a buffer on construction.
DocIterator::DocIterator(Buffer * buf)
: boundary_(false), inset_(nullptr), buffer_(buf)
{}
DocIterator::DocIterator(Buffer * buf, Inset * inset)
: boundary_(false), inset_(inset), buffer_(buf)
{}
DocIterator doc_iterator_begin(const Buffer * buf0, const Inset * inset0) DocIterator doc_iterator_begin(const Buffer * buf0, const Inset * inset0)
{ {
Buffer * buf = const_cast<Buffer *>(buf0); Buffer * buf = const_cast<Buffer *>(buf0);

View File

@ -36,9 +36,13 @@ class DocIterator
{ {
public: public:
/// ///
DocIterator(); DocIterator() = default;
///
explicit DocIterator(Buffer *buf); // We could be able to get rid of this if only every BufferView were
// associated to a buffer on construction.
explicit DocIterator(Buffer *buf)
: buffer_(buf)
{}
/// access to owning buffer /// access to owning buffer
Buffer * buffer() const { return buffer_; } Buffer * buffer() const { return buffer_; }
@ -271,7 +275,10 @@ private:
friend DocIterator doc_iterator_begin(Buffer const * buf, Inset const * inset); friend DocIterator doc_iterator_begin(Buffer const * buf, Inset const * inset);
friend DocIterator doc_iterator_end(Buffer const * buf, Inset const * inset); friend DocIterator doc_iterator_end(Buffer const * buf, Inset const * inset);
/// ///
explicit DocIterator(Buffer * buf, Inset * inset); explicit DocIterator(Buffer * buf, Inset * inset)
: inset_(inset), buffer_(buf)
{}
/** /**
* Normally, when the cursor is at position i, it is painted *before* * Normally, when the cursor is at position i, it is painted *before*
* the character at position i. However, what if we want the cursor * the character at position i. However, what if we want the cursor
@ -297,15 +304,15 @@ private:
* happen *before* i. If the cursor, however, were painted *after* i, that * happen *before* i. If the cursor, however, were painted *after* i, that
* would be very unnatural... * would be very unnatural...
*/ */
bool boundary_; bool boundary_ = false;
/// ///
std::vector<CursorSlice> const & internalData() const { return slices_; } std::vector<CursorSlice> const & internalData() const { return slices_; }
/// ///
std::vector<CursorSlice> slices_; std::vector<CursorSlice> slices_;
/// ///
Inset * inset_; Inset * inset_ = nullptr;
/// ///
Buffer * buffer_; Buffer * buffer_ = nullptr;
}; };