remove unused CursorSlice::invalidate & isValid methods

[lyx.git] / src / FontIterator.h

diff --git a/src/FontIterator.h b/src/FontIterator.h
index 7d0250bd4de3240814c0ec55b1d0d4b1937294df..04d05dde7aa69d1df74f65476d9254ae8ea2268a 100644 (file)
--- a/src/FontIterator.h
+++ b/src/FontIterator.h
@@ -9,7 +9,7 @@
  * Full author contact details are available in file CREDITS.
  *
  *
- * Calling LyXText::getFont is slow. While rebreaking we scan a
+ * Calling Text::getFont is slow. While rebreaking we scan a
  * paragraph from left to right calling getFont for every char.  This
  * simple class address this problem by hidding an optimization trick
  * (not mine btw -AB): the font is reused in the whole font span.  The
@@ -20,38 +20,49 @@
 #ifndef FONTITERATOR_H
 #define FONTITERATOR_H
 
-#include "lyxfont.h"
+#include "Font.h"
 
 #include "support/types.h"
 
-class LyXText;
 
+namespace lyx {
 
-class FontIterator : std::iterator<std::forward_iterator_tag, LyXFont>
+class Buffer;
+class Text;
+class Paragraph;
+
+
+class FontIterator : std::iterator<std::forward_iterator_tag, Font>
 {
 public:
        ///
-       FontIterator(LyXText const & text, lyx::par_type pit, lyx::pos_type pos);
+       FontIterator(Buffer const & buffer, Text const & text,
+               Paragraph const & par, pos_type pos);
        ///
-       LyXFont operator*() const;
+       Font const & operator*() const;
        ///
        FontIterator & operator++();
        ///
-       LyXFont * operator->();
+       Font * operator->();
 
 private:
        ///
-       LyXText const & text_;
+       Buffer const & buffer_;
+       ///
+       Text const & text_;
        ///
-       lyx::par_type pit_;
+       Paragraph const & par_;
        ///
-       lyx::pos_type pos_;
+       pos_type pos_;
        ///
-       LyXFont font_;
+       Font font_;
        ///
-       lyx::pos_type endspan_;
+       pos_type endspan_;
        ///
-       lyx::pos_type bodypos_;
+       pos_type bodypos_;
 };
 
+
+} // namespace lyx
+
 #endif // FONTITERATOR_H