commit 19f5aa58aa55fe210c689052967ade0f943f82fb
Author: Yuriy Skalko <yuriy.ska...@gmail.com>
Date: Sat Nov 28 01:14:32 2020 +0200
Simplify DocIterator
---
src/DocIterator.cpp | 17 -----------------
src/DocIterator.h | 21 ++++++++++++++-------
2 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index b49fc2e..7c1924c 100644
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -44,23 +44,6 @@ using namespace lyx::support;
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)
{
Buffer * buf = const_cast<Buffer *>(buf0);
diff --git a/src/DocIterator.h b/src/DocIterator.h
index ca68757..5e6ae6c 100644
--- a/src/DocIterator.h
+++ b/src/DocIterator.h
@@ -36,9 +36,13 @@ class DocIterator
{
public:
///
- DocIterator();
- ///
- explicit DocIterator(Buffer *buf);
+ DocIterator() = default;
+
+ // 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
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_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*
* 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
* would be very unnatural...
*/
- bool boundary_;
+ bool boundary_ = false;
///
std::vector<CursorSlice> const & internalData() const { return slices_;
}
///
std::vector<CursorSlice> slices_;
///
- Inset * inset_;
+ Inset * inset_ = nullptr;
///
- Buffer * buffer_;
+ Buffer * buffer_ = nullptr;
};
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
