ws changes only

[lyx.git] / src / iterators.h

diff --git a/src/iterators.h b/src/iterators.h
index 5cca3f717d6dc3e2fa4de25696a0a0467960c646..8a7ea614a6d34a28f3a76fbd62cd28f2a0b61392 100644 (file)
--- a/src/iterators.h
+++ b/src/iterators.h
@@ -6,13 +6,13 @@
  * \author unknown
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef ITERATORS_H
 #define ITERATORS_H
 
-#include "ParagraphList.h"
+#include "ParagraphList_fwd.h"
 
 #include <boost/scoped_ptr.hpp>
 
@@ -25,11 +25,19 @@ public:
        ///
        ParIterator(ParIterator const &);
        ///
+       void operator=(ParIterator const &);
+       ///
        ParIterator & operator++();
        ///
-       ParagraphList::iterator operator*() const;
+       Paragraph & operator*() const;
        ///
        ParagraphList::iterator operator->() const;
+       /// This gives us the top-most parent paragraph
+       ParagraphList::iterator outerPar() const;
+       ///
+       ParagraphList::iterator pit() const;
+       ///
+       ParagraphList & plist() const;
        ///
        size_t size() const;
        ///
@@ -58,11 +66,15 @@ public:
        ///
        ParConstIterator & operator++();
        ///
-       ParagraphList::iterator operator*() const;
+       ParagraphList::const_iterator pit() const;
        ///
-       ParagraphList::iterator operator->() const;
-
+       Paragraph const & operator*() const;
+       ///
+       ParagraphList::const_iterator operator->() const;
        ///
+       ParagraphList const & plist() const;
+
+       /// depth of nesting
        size_t size() const;
        ///
        friend