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

diff --git a/src/FontIterator.h b/src/FontIterator.h
index e52c67b175..87686bdee1 100644
--- a/src/FontIterator.h
+++ b/src/FontIterator.h
@@ -24,34 +24,45 @@
 
 #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, lyx::par_type 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_;
 	///
-	lyx::par_type pit_;
+	Paragraph const & par_;
 	///
-	lyx::pos_type pos_;
+	pos_type pos_;
 	///
 	LyXFont font_;
 	///
-	lyx::pos_type endspan_;
+	pos_type endspan_;
 	///
-	lyx::pos_type bodypos_;
+	pos_type bodypos_;
 };
 
+
+} // namespace lyx
+
 #endif // FONTITERATOR_H