nullptr

[lyx.git] / src / ParIterator.h

diff --git a/src/ParIterator.h b/src/ParIterator.h
index 71e5417ddc8a6a1e2006ecdf606065821c7c00d7..f1e2752009590d19297cbe7db73bc90282385f1b 100644 (file)
--- a/src/ParIterator.h
+++ b/src/ParIterator.h
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author unknown
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -16,13 +16,12 @@
 
 #include "support/types.h"
 
-#include <vector>
-
 
 namespace lyx {
 
+class Buffer;
 class Inset;
-class Text;
+class Paragraph;
 class ParagraphList;
 
 
@@ -38,14 +37,14 @@ public:
        typedef StdIt::reference reference;
 
        ///
-       ParIterator() : DocIterator() {}
-
        ///
-       ParIterator(Inset &, pit_type pit);
+       ParIterator(Buffer * buf) : DocIterator(buf) {}
        ///
-       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 &);
@@ -71,8 +70,6 @@ public:
 };
 
 
-DocIterator makeDocIterator(ParIterator const &, pos_type);
-
 ParIterator par_iterator_begin(Inset & inset);
 
 ParIterator par_iterator_end(Inset & inset);
@@ -96,12 +93,16 @@ class ParConstIterator : public std::iterator<std::forward_iterator_tag,
 {
 public:
        ///
-       ParConstIterator() : DocIterator() {}
+       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 &);
 
        ParConstIterator & operator++();
        ///
@@ -119,12 +120,6 @@ public:
 //bool operator!=(ParConstIterator const & it1, ParConstIterator const & it2);
 
 
-ParConstIterator par_const_iterator_begin(Inset const & inset);
-
-ParConstIterator par_const_iterator_end(Inset const & inset);
-
-
-
 } // namespace lyx
 
 #endif