parlist-23-a,diff

[features.git] / src / ParagraphList.h

diff --git a/src/ParagraphList.h b/src/ParagraphList.h
index 2251875ac9de853042e27f5b887ad2ad75aa5c52..55ee259fd84217c01ba9d01aa26af049a82edfa1 100644 (file)
--- a/src/ParagraphList.h
+++ b/src/ParagraphList.h
@@ -26,6 +26,7 @@ public:
        ///
        class iterator {
        public:
+               friend class ParagraphList;
                ///
                typedef std::bidirectional_iterator_tag iterator_category;
                ///
@@ -39,8 +40,6 @@ public:
                ///
                iterator();
                ///
-               iterator(value_type);
-               ///
                reference operator*();
                ///
                pointer operator->();
@@ -53,6 +52,42 @@ public:
                ///
                iterator operator--(int);
        private:
+               ///
+               iterator(value_type);
+               ///
+               Paragraph * ptr;
+       };
+       ///
+       class const_iterator {
+       public:
+               friend class ParagraphList;
+               ///
+               typedef std::bidirectional_iterator_tag iterator_category;
+               ///
+               typedef Paragraph * value_type;
+               ///
+               typedef ptrdiff_t difference_type;
+               ///
+               typedef Paragraph const * const_pointer;
+               ///
+               typedef Paragraph const & const_reference;
+               ///
+               const_iterator();
+               ///
+               const_reference operator*();
+               ///
+               const_pointer operator->();
+               ///
+               const_iterator & operator++();
+               ///
+               const_iterator operator++(int);
+               ///
+               const_iterator & operator--();
+               ///
+               const_iterator operator--(int);
+       private:
+               ///
+               const_iterator(value_type);
                ///
                Paragraph * ptr;
        };
@@ -63,7 +98,7 @@ public:
        ///
        ParagraphList & operator=(ParagraphList const &);
        ///
-       iterator insert(iterator it, Paragraph * par);
+       iterator insert(iterator it, Paragraph const & par);
        ///
        void insert(iterator pos, iterator beg, iterator end);
        ///
@@ -79,11 +114,11 @@ public:
        ///
        iterator begin();
        ///
-       iterator begin() const;
+       const_iterator begin() const;
        ///
        iterator end();
        ///
-       iterator end() const;
+       const_iterator end() const;
        ///
        void push_back(Paragraph const &);
        ///
@@ -116,6 +151,13 @@ bool operator==(ParagraphList::iterator const & i1,
 bool operator!=(ParagraphList::iterator const & i1,
                ParagraphList::iterator const & i2);
 
+///
+bool operator==(ParagraphList::const_iterator const & i1,
+               ParagraphList::const_iterator const & i2);
+///
+bool operator!=(ParagraphList::const_iterator const & i1,
+               ParagraphList::const_iterator const & i2);
+
 #endif
 
 #endif