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

diff --git a/src/FontIterator.h b/src/FontIterator.h
index 7776f5f4df..87686bdee1 100644
--- a/src/FontIterator.h
+++ b/src/FontIterator.h
@@ -24,6 +24,10 @@
 
 #include "support/types.h"
 
+
+namespace lyx {
+
+class Buffer;
 class LyXText;
 class Paragraph;
 
@@ -32,27 +36,33 @@ class FontIterator : std::iterator<std::forward_iterator_tag, LyXFont>
 {
 public:
 	///
-	FontIterator(LyXText const & text, Paragraph const & par, lyx::pos_type pos);
+	FontIterator(Buffer const & buffer, LyXText const & text,
+		Paragraph const & par, pos_type pos);
 	///
-	LyXFont operator*() const;
+	LyXFont const & operator*() const;
 	///
 	FontIterator & operator++();
 	///
 	LyXFont * operator->();
 
 private:
+	///
+	Buffer const & buffer_;
 	///
 	LyXText const & text_;
 	///
 	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