Simplify

[lyx.git] / src / ParIterator.h

diff --git a/src/ParIterator.h b/src/ParIterator.h
index 86ae70edd8debce6e091ba943c541a3c5673123e..2253a1d7bb69845e4e3677d33a5247ed7242243f 100644 (file)
--- a/src/ParIterator.h
+++ b/src/ParIterator.h
@@ -16,36 +16,26 @@
 
 #include "support/types.h"
 
-#include <vector>
-
 
 namespace lyx {
 
+class Buffer;
 class Inset;
-class Text;
+class Paragraph;
 class ParagraphList;
 
 
-class ParIterator : public std::iterator<std::forward_iterator_tag, Paragraph>,
-                   public DocIterator
+class ParIterator : public DocIterator
 {
 public:
-       typedef std::iterator<std::forward_iterator_tag, Paragraph> StdIt;
-
-       typedef StdIt::value_type value_type;
-       typedef StdIt::difference_type difference_type;
-       typedef StdIt::pointer pointer;
-       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 &);
@@ -88,17 +78,18 @@ ParIterator par_iterator_end(Inset & inset);
 //bool operator!=(ParIterator const & it1, ParIterator const & it2);
 
 
-class ParConstIterator : public std::iterator<std::forward_iterator_tag,
-                        Paragraph>,
-                        public DocIterator
+class ParConstIterator : public DocIterator
 {
 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 &);
 
@@ -118,12 +109,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