[LyX/master] Move trivial constructors into header. Remove unimplemented one.
Richard Kimberly Heck
rikiheck at lyx.org
Fri Nov 6 16:01:14 UTC 2020
commit 5bd498c56d226448b69baee07fab7c64b60f9471
Author: Richard Kimberly Heck <rikiheck at lyx.org>
Date: Fri Nov 6 11:23:52 2020 -0500
Move trivial constructors into header. Remove unimplemented one.
---
src/ParIterator.cpp | 24 ------------------------
src/ParIterator.h | 18 ++++++++++--------
2 files changed, 10 insertions(+), 32 deletions(-)
diff --git a/src/ParIterator.cpp b/src/ParIterator.cpp
index 0464839..8086d2f 100644
--- a/src/ParIterator.cpp
+++ b/src/ParIterator.cpp
@@ -26,15 +26,6 @@ namespace lyx {
//
//////////////////////////////////////////////////////////////////////////
-ParIterator::ParIterator(DocIterator const & dit)
- : DocIterator(dit)
-{}
-
-
-ParIterator::ParIterator(ParIterator const & pi)
- : DocIterator(DocIterator(pi))
-{}
-
ParIterator par_iterator_begin(Inset & inset)
{
@@ -113,21 +104,6 @@ ParagraphList & ParIterator::plist() const
//////////////////////////////////////////////////////////////////////////
-ParConstIterator::ParConstIterator(Buffer const * buf)
- : DocIterator(const_cast<Buffer *>(buf))
-{}
-
-
-ParConstIterator::ParConstIterator(DocIterator const & dit)
- : DocIterator(dit)
-{}
-
-
-ParConstIterator::ParConstIterator(ParConstIterator const & pi)
- : DocIterator(DocIterator(pi))
-{}
-
-
void ParConstIterator::push_back(Inset const & inset)
{
DocIterator::push_back(CursorSlice(const_cast<Inset &>(inset)));
diff --git a/src/ParIterator.h b/src/ParIterator.h
index 288b035..f1e2752 100644
--- a/src/ParIterator.h
+++ b/src/ParIterator.h
@@ -39,13 +39,12 @@ public:
///
///
ParIterator(Buffer * buf) : DocIterator(buf) {}
-
- ///
- ParIterator(Buffer * buf, Inset &, pit_type pit);
///
- ParIterator(ParIterator const &);
+ ParIterator(ParIterator const & pi) :
+ DocIterator(DocIterator(pi)) {}
///
- explicit ParIterator(DocIterator const &);
+ explicit ParIterator(DocIterator const & dit) :
+ DocIterator(dit) {}
/// This really should be implemented...
//ParIterator & operator=(ParIterator const &);
@@ -94,11 +93,14 @@ class ParConstIterator : public std::iterator<std::forward_iterator_tag,
{
public:
///
- ParConstIterator(Buffer const * buf);
+ ParConstIterator(Buffer const * buf)
+ : DocIterator(const_cast<Buffer *>(buf)) {}
///
- ParConstIterator(ParConstIterator const &);
+ ParConstIterator(ParConstIterator const & pi)
+ : DocIterator(DocIterator(pi)) {}
///
- explicit ParConstIterator(DocIterator const &);
+ explicit ParConstIterator(DocIterator const & dit)
+ : DocIterator(dit) {}
///
void push_back(Inset const &);
More information about the lyx-cvs
mailing list