changelogs

[lyx.git] / src / pariterator.h

diff --git a/src/pariterator.h b/src/pariterator.h
index 31227926d73ed03d7c03ea70b2018f6113156b49..1dbd705d7bdff5bd50804c50600a936e8cfcbded 100644 (file)
--- a/src/pariterator.h
+++ b/src/pariterator.h
@@ -28,36 +28,49 @@ class ParagraphList;
 
 
 class ParIterator : public std::iterator<std::forward_iterator_tag, Paragraph>,
-                   public DocumentIterator
+                   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(InsetBase &, lyx::par_type pit);
+       ParIterator(InsetBase &, lyx::pit_type pit);
        ///
        ParIterator(ParIterator const &);
        ///
-       ParIterator(DocumentIterator const &);
+       ParIterator(DocIterator const &);
 
-       ///
-       void operator=(ParIterator const &);
+       /// This really should be implemented...
+       //ParIterator & operator=(ParIterator const &);
        ///
        ParIterator & operator++();
        ///
-       ParIterator & operator--();
+       ParIterator operator++(int);
+       /// See comment in pariterator.C
+       //ParIterator & operator--();
        ///
        Paragraph & operator*() const;
        ///
        Paragraph * operator->() const;
        /// This gives us the top-most parent paragraph
-       lyx::par_type outerPar() const;
+       lyx::pit_type outerPar() const;
        ///
-       lyx::par_type pit() const;
+       lyx::pit_type pit() const;
        ///
        ParagraphList & plist() const;
 };
 
 
-DocumentIterator makeDocumentIterator(ParIterator const &, lyx::pos_type);
+DocIterator makeDocIterator(ParIterator const &, lyx::pos_type);
 
 ParIterator par_iterator_begin(InsetBase & inset);
 
@@ -73,13 +86,13 @@ bool operator!=(ParIterator const & iter1, ParIterator const & iter2);
 
 class ParConstIterator : public std::iterator<std::forward_iterator_tag,
                         Paragraph>,
-                        public DocumentIterator
+                        public DocIterator
 {
 public:
        ///
        ParConstIterator(ParConstIterator const &);
        ///
-       ParConstIterator(DocumentIterator const &);
+       ParConstIterator(DocIterator const &);
        ///
 
        ParConstIterator & operator++();