X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontIterator.h;h=87686bdee16994a5d306f0b8bf2ec6598600a315;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=f640c8a66170804f223c8b9e78478f1f0bea9c11;hpb=a92a5e20e6560ca675710b0def3703845e67737d;p=lyx.git

diff --git a/src/FontIterator.h b/src/FontIterator.h
index f640c8a661..87686bdee1 100644
--- a/src/FontIterator.h
+++ b/src/FontIterator.h
@@ -20,31 +20,49 @@
 #ifndef FONTITERATOR_H
 #define FONTITERATOR_H
 
-
 #include "lyxfont.h"
-#include "ParagraphList_fwd.h"
 
 #include "support/types.h"
 
+
+namespace lyx {
+
+class Buffer;
 class LyXText;
+class Paragraph;
+
 
 class FontIterator : std::iterator<std::forward_iterator_tag, LyXFont>
 {
 public:
-	FontIterator(LyXText const & text, ParagraphList::iterator pit,
-		     lyx::pos_type pos);
-	
-	LyXFont operator*() const;
+	///
+	FontIterator(Buffer const & buffer, LyXText const & text,
+		Paragraph const & par, pos_type pos);
+	///
+	LyXFont const & operator*() const;
+	///
 	FontIterator & operator++();
+	///
 	LyXFont * operator->();
 
 private:
+	///
+	Buffer const & buffer_;
+	///
 	LyXText const & text_;
-	ParagraphList::iterator pit_;
-	lyx::pos_type pos_;
+	///
+	Paragraph const & par_;
+	///
+	pos_type pos_;
+	///
 	LyXFont font_;
-	lyx::pos_type endspan_;
-	lyx::pos_type bodypos_;
+	///
+	pos_type endspan_;
+	///
+	pos_type bodypos_;
 };
 
-#endif //FONTITERATOR_H
+
+} // namespace lyx
+
+#endif // FONTITERATOR_H